diff options
| author | Charles Strahan <charles@cstrahan.com> | 2017-05-28 14:19:40 -0400 |
|---|---|---|
| committer | Charles Strahan <charles@cstrahan.com> | 2017-05-28 14:36:37 -0400 |
| commit | 132b503aacb7dcc181d12804dee110f68f9f3730 (patch) | |
| tree | 2e28328a944aa91f17437d8e6a79fa8a4cca2dea | |
| parent | 60ba38fd8a9fe95ab9dd614fccc9917fb2b866a0 (diff) | |
| download | nixlib-132b503aacb7dcc181d12804dee110f68f9f3730.tar nixlib-132b503aacb7dcc181d12804dee110f68f9f3730.tar.gz nixlib-132b503aacb7dcc181d12804dee110f68f9f3730.tar.bz2 nixlib-132b503aacb7dcc181d12804dee110f68f9f3730.tar.lz nixlib-132b503aacb7dcc181d12804dee110f68f9f3730.tar.xz nixlib-132b503aacb7dcc181d12804dee110f68f9f3730.tar.zst nixlib-132b503aacb7dcc181d12804dee110f68f9f3730.zip | |
GHCJS packages: avoid inode explosion
As noted in #25595, a change introduced in 4b77d425aa597 causes an explosion of inodes due to the constructions of many, many `ghcEnv` symlink forests. This commit undoes that change. To discuss reworking the support for GHCJS plugins, please see: #26192 Fixes #25595
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 653e5cd245ca..7d21996fe1cd 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -197,13 +197,11 @@ 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="${if ghc.isGhcjs or false then ghcEnv else ghc}/bin:$PATH" + export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} packageConfDir="$TMPDIR/package.conf.d" |