about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-06-25 15:47:22 -0500
committerWill Dietz <w@wdtz.org>2018-06-25 15:50:27 -0500
commit449fbec9be1865fca59e973f05dd06d213820c5e (patch)
treea5b2ed48e017de5997e6a2bda0e7a5f9e565f12e /pkgs
parent6946361408333f6f39ab767d07031cd32b31dca1 (diff)
downloadnixlib-449fbec9be1865fca59e973f05dd06d213820c5e.tar
nixlib-449fbec9be1865fca59e973f05dd06d213820c5e.tar.gz
nixlib-449fbec9be1865fca59e973f05dd06d213820c5e.tar.bz2
nixlib-449fbec9be1865fca59e973f05dd06d213820c5e.tar.lz
nixlib-449fbec9be1865fca59e973f05dd06d213820c5e.tar.xz
nixlib-449fbec9be1865fca59e973f05dd06d213820c5e.tar.zst
nixlib-449fbec9be1865fca59e973f05dd06d213820c5e.zip
ghcHEAD: add musl and cross fixes recently applied to 8.4.3 and 8.2.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/ghc/head.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 8ccd72ef55a2..ec9ff56c4585 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -50,7 +50,8 @@ let
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    Stage1Only = YES
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO