diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-06-13 11:40:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-13 11:40:49 -0400 |
| commit | b2a76b64640e089391529073ce220d15c62cf3db (patch) | |
| tree | 40bd6565da995e1ac174868fe0e9a7d64aa897ee | |
| parent | 089297ad29b0421b6d9ddd3f689472cb07784355 (diff) | |
| parent | 529a0f74edc0b9a0e7f4cdb8932ac0b53f5179a0 (diff) | |
| download | nixlib-b2a76b64640e089391529073ce220d15c62cf3db.tar nixlib-b2a76b64640e089391529073ce220d15c62cf3db.tar.gz nixlib-b2a76b64640e089391529073ce220d15c62cf3db.tar.bz2 nixlib-b2a76b64640e089391529073ce220d15c62cf3db.tar.lz nixlib-b2a76b64640e089391529073ce220d15c62cf3db.tar.xz nixlib-b2a76b64640e089391529073ce220d15c62cf3db.tar.zst nixlib-b2a76b64640e089391529073ce220d15c62cf3db.zip | |
Merge pull request #41932 from obsidiansystems/fix-setup-depends
haskell generic-builder: Use separate setup db in more cases
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 17bc8b479c76..1cc385864585 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -166,9 +166,11 @@ let "--configure-option=--host=${hostPlatform.config}" ] ++ crossCabalFlags); + useSeparateSetupDb = setupHaskellDepends != [] || isCross || isGhcjs; + setupCompileFlags = [ (optionalString (!coreSetup) "-${nativePackageDbFlag}=${ - if setupHaskellDepends != [] + if useSeparateSetupDb then "$setupPackageConfDir" else "$packageConfDir" }") @@ -268,7 +270,7 @@ stdenv.mkDerivation ({ echo "Build with ${ghc}." ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} - '' + (optionalString (setupHaskellDepends != []) '' + '' + (optionalString useSeparateSetupDb '' setupPackageConfDir="$TMPDIR/setup-package.conf.d" mkdir -p $setupPackageConfDir '') + '' @@ -282,7 +284,7 @@ stdenv.mkDerivation ({ # dependencies for the build machine. # # pkgs* arrays defined in stdenv/setup.hs - + (optionalString (setupHaskellDepends != []) '' + + (optionalString useSeparateSetupDb '' for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do ${buildPkgDb nativeGhc.name "$setupPackageConfDir"} done |