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
This commit is contained in:
Charles Strahan 2017-05-28 14:19:40 -04:00
parent 60ba38fd8a
commit 132b503aac
No known key found for this signature in database
GPG Key ID: BB47AB4B8489B5A5

View File

@ -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"