reorganisierung
This commit is contained in:
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
[submodule "lib/hs-glsl"]
|
||||||
|
path = lib/hs-glsl
|
||||||
|
url = https://git.mtgmonkey.net/Andromeda/hs-glsl
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||||
|
self.submodules = true;
|
||||||
};
|
};
|
||||||
outputs = {nixpkgs, ...}: let
|
outputs = {nixpkgs, ...}: let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
|||||||
1
lib/hs-glsl
Submodule
1
lib/hs-glsl
Submodule
Submodule lib/hs-glsl added at 2bc1cab2af
27
package.nix
27
package.nix
@@ -4,10 +4,27 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
ghcExeOptions = "-O -Wall -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N";
|
ghcExeOptions = lib.concatStringsSep " " ghcFlags;
|
||||||
|
ghcFlags = [
|
||||||
|
"-O"
|
||||||
|
"-Wall"
|
||||||
|
"-Widentities"
|
||||||
|
"-Widentities"
|
||||||
|
"-Wincomplete-record-updates"
|
||||||
|
"-Wincomplete-uni-patterns"
|
||||||
|
"-Wmissing-export-lists"
|
||||||
|
"-Wmossing-home-modules"
|
||||||
|
"-Wpartial-fields"
|
||||||
|
"-Wredundant-constraints"
|
||||||
|
"-threaded"
|
||||||
|
"-rtsopts"
|
||||||
|
"-with-rtsopts=-N"
|
||||||
|
# hs-glsl
|
||||||
|
"-i./lib/hs-glsl/src/Language/GLSL.hs"
|
||||||
|
# src
|
||||||
|
"-i./src"
|
||||||
|
];
|
||||||
ghcPackages = p: [
|
ghcPackages = p: [
|
||||||
p.bytestring
|
|
||||||
p.data-default
|
|
||||||
p.GLFW-b
|
p.GLFW-b
|
||||||
p.OpenGL
|
p.OpenGL
|
||||||
p.relude
|
p.relude
|
||||||
@@ -16,7 +33,7 @@ in
|
|||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "haskengl";
|
pname = "haskengl";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
src = ./src;
|
src = ./.;
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
(haskellPackages.ghcWithPackages ghcPackages)
|
(haskellPackages.ghcWithPackages ghcPackages)
|
||||||
];
|
];
|
||||||
@@ -25,7 +42,7 @@ in
|
|||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
'';
|
'';
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
ghc ${ghcExeOptions} ./Main.hs -o ./Main
|
ghc ${ghcExeOptions} ./src/Main.hs -o ./Main
|
||||||
'';
|
'';
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
|
|||||||
Reference in New Issue
Block a user