From 6a23c9ddbef2bf80f28d9d2cda778f429a50b3f1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 25 Dec 2019 13:14:48 -0500 Subject: [PATCH] haskell generic-builder: Fix `--with-ghc` flag for GHCJS as cross Otherwise it passes `--with-ghc=ghc`, and we do the wrong thing. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d6966d691363..e27769d9c766 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"