fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build on Nix

Browse Source
This commit is contained in:
Gregor Kleen 2018-01-30 15:09:44 +01:00
parent 7536af9bdc
commit 3c12f0bb31
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shell.nix
View File

@ -1,4 +1,4 @@
{ nixpkgs ? import <nixpkgs> {}, compiler ? null }: { nixpkgs ? import <nixpkgs> {}, compiler ? "ghc802" }:
let let
inherit (nixpkgs) pkgs; inherit (nixpkgs) pkgs;
@ -22,7 +22,7 @@ let
''; '';
override = oldAttrs: { override = oldAttrs: {
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ postgresql ]) ++ (with haskellPackages; [ stack stack-run yesod-bin ]); nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ postgresql ]) ++ (with haskellPackages; [ stack yesod-bin ]);
shellHook = '' shellHook = ''
${oldAttrs.shellHook} ${oldAttrs.shellHook}
export PROMPT_INFO="${oldAttrs.name}" export PROMPT_INFO="${oldAttrs.name}"
@ -44,5 +44,10 @@ let
exit ''${ret} exit ''${ret}
''; '';
}; };
in
pkgs.stdenv.lib.overrideDerivation drv.env override dummy = pkgs.stdenv.mkDerivation {
name = "interactive-uniworx-environment";
shellHook = "";
};
in pkgs.stdenv.lib.overrideDerivation dummy override
#pkgs.stdenv.lib.overrideDerivation drv.env override

6
stack.nix
View File

@ -5,7 +5,9 @@ let
in haskell.lib.buildStackProject { in haskell.lib.buildStackProject {
inherit ghc; inherit ghc;
name = "stackenv"; name = "stackenv";
buildInputs = with pkgs; buildInputs = (with pkgs;
[ postgresql zlib openldap cyrus_sasl.dev [ postgresql zlib openldap cyrus_sasl.dev
]; ]) ++ (with haskell.packages."ghc${builtins.replaceStrings ["."] [""] ghc.version}";
[ yesod-bin
]);
} }