diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2016-02-18 03:11:42 -0500 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2016-02-18 03:15:59 -0500 |
| commit | 97d9071b95e25eb2d9840b0f24639e2fb8eab5e0 (patch) | |
| tree | dd3cdba55cf2c67cc90311289244ff3151ca24ee /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | bbce88302a98338f014e7978e128f438dec3cc2d (diff) | |
| download | nixlib-97d9071b95e25eb2d9840b0f24639e2fb8eab5e0.tar nixlib-97d9071b95e25eb2d9840b0f24639e2fb8eab5e0.tar.gz nixlib-97d9071b95e25eb2d9840b0f24639e2fb8eab5e0.tar.bz2 nixlib-97d9071b95e25eb2d9840b0f24639e2fb8eab5e0.tar.lz nixlib-97d9071b95e25eb2d9840b0f24639e2fb8eab5e0.tar.xz nixlib-97d9071b95e25eb2d9840b0f24639e2fb8eab5e0.tar.zst nixlib-97d9071b95e25eb2d9840b0f24639e2fb8eab5e0.zip | |
ghcjs: use native ghc to build Setup.hs
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d05980192831..b871b7d73faa 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -125,15 +125,8 @@ let ghcEnv = ghc.withPackages (p: haskellBuildInputs); - setupBuilder = if isGhcjs - then (if !(builtins.elem pname ["Cabal" "hscolour"]) - 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"; + setupBuilder = if isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand; + setupCommand = "./Setup"; ghcCommand = if isGhcjs then "ghcjs" else "ghc"; ghcCommandCaps = toUpper ghcCommand; |