diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-04-15 12:34:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-15 12:34:41 +0200 |
| commit | 26f5fa8f974aba0c08376e995deb8c50aff48727 (patch) | |
| tree | 0cccd436aaac6c7bb18b306be3a5c94d9676f17c /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | 45cb7c2c0efc61e9871562fe343efcea3c9171db (diff) | |
| parent | 2fde20e271a9b0ffa29b1abaea155e6b76b50194 (diff) | |
| download | nixlib-26f5fa8f974aba0c08376e995deb8c50aff48727.tar nixlib-26f5fa8f974aba0c08376e995deb8c50aff48727.tar.gz nixlib-26f5fa8f974aba0c08376e995deb8c50aff48727.tar.bz2 nixlib-26f5fa8f974aba0c08376e995deb8c50aff48727.tar.lz nixlib-26f5fa8f974aba0c08376e995deb8c50aff48727.tar.xz nixlib-26f5fa8f974aba0c08376e995deb8c50aff48727.tar.zst nixlib-26f5fa8f974aba0c08376e995deb8c50aff48727.zip | |
Merge pull request #24922 from phunehehe/haskell-shell-hook
haskell-modules: fix shell hook
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 0c51f208f462..f7d16a89df86 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -330,9 +330,11 @@ stdenv.mkDerivation ({ export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}" export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" - '' + (if isHaLVM - then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"'' - else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"'') + "${shellHook}"; + ${if isHaLVM + then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"'' + else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"''} + ${shellHook} + ''; }; }; |