diff options
| author | 3noch <eacameron@gmail.com> | 2017-02-25 17:45:40 -0500 |
|---|---|---|
| committer | Charles Strahan <charles@cstrahan.com> | 2017-03-02 11:35:11 -0500 |
| commit | 4b77d425aa5970f39f0637894075d2df8c1575c8 (patch) | |
| tree | 72d7427bac79601f92d16a1ca04dff262d4e6e47 /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | 7d356ff69646e78c5f9a362ff8b5912fa9ecec7c (diff) | |
| download | nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar.gz nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar.bz2 nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar.lz nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar.xz nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.tar.zst nixlib-4b77d425aa5970f39f0637894075d2df8c1575c8.zip | |
Fix GHCJS HEAD patch; support GHCJS libdir link; use full ghcEnv for GHCJS
Original: https://github.com/NixOS/nixpkgs-channels/commit/f3110651c81cc3fd4f6d342f0c30d363ea8cd0b0 (With some tweaks from @cstrahan) closes #23199
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 42ea03693ecd..e47375e71c73 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -193,11 +193,13 @@ stdenv.mkDerivation ({ ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal '' + postPatch; + # for ghcjs, we want to put ghcEnv on PATH so compiler plugins will be available. + # TODO(cstrahan): would the same be of benefit to native ghc? setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment echo "Build with ${ghc}." - export PATH="${ghc}/bin:$PATH" + export PATH="${if ghc.isGhcjs or false then ghcEnv else ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} packageConfDir="$TMPDIR/package.conf.d" |