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

ghcjs: use native ghc to build Setup.hs

This commit is contained in:
Charles Strahan 2016-02-18 03:11:42 -05:00
parent bbce88302a
commit 97d9071b95
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -125,15 +125,8 @@ let
ghcEnv = ghc.withPackages (p: haskellBuildInputs); ghcEnv = ghc.withPackages (p: haskellBuildInputs);
setupBuilder = if isGhcjs setupBuilder = if isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand;
then (if !(builtins.elem pname ["Cabal" "hscolour"]) setupCommand = "./Setup";
then ghcCommand
else "${nativeGhc}/bin/ghc")
else ghcCommand;
setupCommand = if isGhcjs && !(builtins.elem pname ["Cabal" "hscolour"])
then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js"
else "./Setup";
ghcCommand = if isGhcjs then "ghcjs" else "ghc"; ghcCommand = if isGhcjs then "ghcjs" else "ghc";
ghcCommandCaps = toUpper ghcCommand; ghcCommandCaps = toUpper ghcCommand;