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

Merge pull request #9756 from adnelson/feature/shellHook_option_in_haskell_mkderivation

Browse Source 
add shellHook argument so that users can pass in their own
This commit is contained in:
Peter Simons 2015-09-09 22:31:13 +02:00
commit f24ccfd54d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@
, installPhase ? "", preInstall ? "", postInstall ? "" , installPhase ? "", preInstall ? "", postInstall ? ""
, checkPhase ? "", preCheck ? "", postCheck ? "" , checkPhase ? "", preCheck ? "", postCheck ? ""
, preFixup ? "", postFixup ? "" , preFixup ? "", postFixup ? ""
, shellHook ? ""
, coreSetup ? false # Use only core packages to build Setup.hs. , coreSetup ? false # Use only core packages to build Setup.hs.
, useCpphs ? false , useCpphs ? false
} @ args: } @ args:
@ -279,6 +280,7 @@ stdenv.mkDerivation ({
export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"
export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}" export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}"
${shellHook}
''; '';
}; };