summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/generic-builder.nix
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2019-12-25 13:14:48 -0500
committerJohn Ericson <git@JohnEricson.me>2019-12-25 13:14:48 -0500
commit6a23c9ddbef2bf80f28d9d2cda778f429a50b3f1 (patch)
tree5e78343d078327b03d582757a27bdacda6658cc3 /pkgs/development/haskell-modules/generic-builder.nix
parented6c877f143db3bbe3c17a71370a0b93b244d813 (diff)
downloadnixpkgs-6a23c9ddbef2bf80f28d9d2cda778f429a50b3f1.tar
nixpkgs-6a23c9ddbef2bf80f28d9d2cda778f429a50b3f1.tar.gz
nixpkgs-6a23c9ddbef2bf80f28d9d2cda778f429a50b3f1.tar.bz2
nixpkgs-6a23c9ddbef2bf80f28d9d2cda778f429a50b3f1.tar.lz
nixpkgs-6a23c9ddbef2bf80f28d9d2cda778f429a50b3f1.tar.xz
nixpkgs-6a23c9ddbef2bf80f28d9d2cda778f429a50b3f1.tar.zst
nixpkgs-6a23c9ddbef2bf80f28d9d2cda778f429a50b3f1.zip
haskell generic-builder: Fix `--with-ghc` flag for GHCJS as cross
Otherwise it passes `--with-ghc=ghc`, and we do the wrong thing.
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
-rw-r--r--pkgs/development/haskell-modules/generic-builder.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index d6966d69136..e27769d9c76 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -131,7 +131,7 @@ let
                    '';
 
   crossCabalFlags = [
-    "--with-ghc=${ghc.targetPrefix}ghc"
+    "--with-ghc=${ghcCommand}"
     "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
   ] ++ optionals stdenv.hasCC [
     "--with-gcc=${stdenv.cc.targetPrefix}cc"