diff options
| author | John Ericson <git@JohnEricson.me> | 2019-12-25 13:17:00 -0500 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-12-25 13:17:00 -0500 |
| commit | 49daa0aa64aea9143f9deb75bf277670dac90e1f (patch) | |
| tree | 556940b44b5dc1085c682f9133ce9f9f23f83a43 | |
| parent | f29fceebdcb1b765d12bfaef9ff15bfe1f4e13df (diff) | |
| parent | 6a23c9ddbef2bf80f28d9d2cda778f429a50b3f1 (diff) | |
| download | nixlib-49daa0aa64aea9143f9deb75bf277670dac90e1f.tar nixlib-49daa0aa64aea9143f9deb75bf277670dac90e1f.tar.gz nixlib-49daa0aa64aea9143f9deb75bf277670dac90e1f.tar.bz2 nixlib-49daa0aa64aea9143f9deb75bf277670dac90e1f.tar.lz nixlib-49daa0aa64aea9143f9deb75bf277670dac90e1f.tar.xz nixlib-49daa0aa64aea9143f9deb75bf277670dac90e1f.tar.zst nixlib-49daa0aa64aea9143f9deb75bf277670dac90e1f.zip | |
Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
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 459b5085249e..e6edc3a2bc5e 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" |