diff options
| author | Peter Simons <simons@cryp.to> | 2015-01-16 21:48:59 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-01-17 20:29:00 +0100 |
| commit | e6ecb1fb83a9fda089c6fa23617185145d54b80f (patch) | |
| tree | 6d032d8be9c3e5ba43773a92d8403035066aa6a9 /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | d1fc5370e93f202c2de5a53ab5620cb29880a103 (diff) | |
| download | nixlib-e6ecb1fb83a9fda089c6fa23617185145d54b80f.tar nixlib-e6ecb1fb83a9fda089c6fa23617185145d54b80f.tar.gz nixlib-e6ecb1fb83a9fda089c6fa23617185145d54b80f.tar.bz2 nixlib-e6ecb1fb83a9fda089c6fa23617185145d54b80f.tar.lz nixlib-e6ecb1fb83a9fda089c6fa23617185145d54b80f.tar.xz nixlib-e6ecb1fb83a9fda089c6fa23617185145d54b80f.tar.zst nixlib-e6ecb1fb83a9fda089c6fa23617185145d54b80f.zip | |
haskell-ng: enable package sets for GHC 6.12.3, 7.0.4, 7.2.2, and 7.4.2
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index c0c3be07df30..0f98ded5eb14 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -55,6 +55,9 @@ let main = defaultMain ''; + ghc76xOrLater = stdenv.lib.versionOlder "7.6" ghc.version; + packageDbFlag = if ghc76xOrLater then "package-db" else "package-conf"; + defaultConfigureFlags = [ (enableFeature enableSplitObjs "split-objs") (enableFeature enableLibraryProfiling "library-profiling") @@ -146,7 +149,7 @@ stdenv.mkDerivation ({ fi done done - ghc-pkg --package-db="$packageConfDir" recache + ghc-pkg --${packageDbFlag}="$packageConfDir" recache configureFlags+=" --package-db=$packageConfDir" ${optionalString (editedCabalFile != null) '' @@ -162,7 +165,7 @@ stdenv.mkDerivation ({ for i in Setup.hs Setup.lhs ${defaultSetupHs}; do test -f $i && break done - ghc ${optionalString (! coreSetup) "-package-db=$packageConfDir "}$setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i + ghc ${optionalString (! coreSetup) "-${packageDbFlag}=$packageConfDir "}$setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i echo configureFlags: $configureFlags unset GHC_PACKAGE_PATH # Cabal complains if this variable is set during configure. |