public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghcWithPackages: fix isGhcjs evaluation even some more 

This is harder than I would have thought.
This commit is contained in:
Peter Simons 2015-03-29 11:02:31 +02:00
parent 9718561589
commit 028779fb40
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/haskell-modules/with-packages-wrapper.nix
View File

@ -29,9 +29,10 @@ assert versionOlder "6.12" ghc.version;
# fi # fi
let let
ghc761OrLater = ghc.isGhcjs || versionOlder "7.6.1" ghc.version; isGhcjs = ghc.isGhcjs or false;
ghc761OrLater = isGhcjs || versionOlder "7.6.1" ghc.version;
packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf";
ghcCommand = if ghc.isGhcjs then "ghcjs" else "ghc"; ghcCommand = if isGhcjs then "ghcjs" else "ghc";
libDir = "$out/lib/${ghcCommand}-${ghc.version}"; libDir = "$out/lib/${ghcCommand}-${ghc.version}";
docDir = "$out/share/doc/ghc/html"; docDir = "$out/share/doc/ghc/html";
packageCfgDir = "${libDir}/package.conf.d"; packageCfgDir = "${libDir}/package.conf.d";
@ -51,7 +52,7 @@ buildEnv {
postBuild = '' postBuild = ''
. ${makeWrapper}/nix-support/setup-hook . ${makeWrapper}/nix-support/setup-hook
${optionalString (ghc.isGhcjs or false) '' ${optionalString isGhcjs ''
cp -r "${ghc}/${ghc.libDir}/"* ${libDir}/ cp -r "${ghc}/${ghc.libDir}/"* ${libDir}/
''} ''}