From 132b503aacb7dcc181d12804dee110f68f9f3730 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 28 May 2017 14:19:40 -0400 Subject: 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 --- pkgs/development/haskell-modules/generic-builder.nix | 4 +--- 1 file changed, 1 insertion(+), 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" -- cgit 1.4.1