public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-generic-builder: make $shellHook in 'env' attribute more robust 

In case our GHC environment is empty, the old code ended up running
'grep export' on a GHC binary, which doesn't seem like a good idea.
This commit is contained in:
Peter Simons 2015-01-11 11:59:47 +01:00
parent dbb4012fdc
commit bca9b8d867
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -80,6 +80,8 @@ let
haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs; haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
systemBuildInputs = stdenv.lib.filter isSystemPkg allBuildInputs; systemBuildInputs = stdenv.lib.filter isSystemPkg allBuildInputs;
ghcEnv = ghc.withPackages (p: haskellBuildInputs);
in in
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "${optionalString hasActiveLibrary "haskell-"}${pname}-${version}"; name = "${optionalString hasActiveLibrary "haskell-"}${pname}-${version}";
@ -213,8 +215,13 @@ stdenv.mkDerivation ({
env = stdenv.mkDerivation { env = stdenv.mkDerivation {
name = "interactive-${optionalString hasActiveLibrary "haskell-"}${pname}-${version}-environment"; name = "interactive-${optionalString hasActiveLibrary "haskell-"}${pname}-${version}-environment";
nativeBuildInputs = [ (ghc.withPackages (p: haskellBuildInputs)) systemBuildInputs ]; nativeBuildInputs = [ ghcEnv systemBuildInputs ];
shellHook = "eval $(grep export $(type -p ghc))"; shellHook = ''
export NIX_GHC="${ghcEnv}/bin/ghc"
export NIX_GHCPKG="${ghcEnv}/bin/ghc"
export NIX_GHC_DOCDIR="${ghcEnv}/share/doc/ghc/html"
export NIX_GHC_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}"
'';
buildCommand = '' buildCommand = ''
echo >&2 "" echo >&2 ""
echo >&2 "*** Haskell 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" echo >&2 "*** Haskell 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"