From 2052323a7884c73fc7a137691b9690d821b906a6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 11:34:57 -0500 Subject: [PATCH] ghc-8.4.3: minor fixes for cross-musl, same as used with 8.2.2 Patches are no longer needed, seem to be more or less upstreamed. --- pkgs/development/compilers/ghc/8.4.3.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 4d2f3894f178..10035af90a89 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -49,7 +49,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