From 449fbec9be1865fca59e973f05dd06d213820c5e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 15:47:22 -0500 Subject: [PATCH] ghcHEAD: add musl and cross fixes recently applied to 8.4.3 and 8.2.2 --- pkgs/development/compilers/ghc/head.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8ccd72ef55a..ec9ff56c458 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