From b19113380f0de343e4b18ae06ef5fd64681caa55 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 1 Oct 2018 20:47:27 +0000 Subject: [PATCH] ghc 8.2.2: Backport cross fixes from 8.4.3 Other patches are also needed for a working build, but that doesn't mean these patches are any less necessary. --- pkgs/development/compilers/ghc/8.2.2.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 6a1914a9c2c..caf5b941f7c 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -22,7 +22,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? true + enableShared ? !stdenv.targetPlatform.useiOSPrebuilt , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. @@ -79,7 +79,7 @@ let targetCC = builtins.head toolsForTarget; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "8.2.2"; name = "${targetPrefix}ghc-${version}"; @@ -239,4 +239,8 @@ stdenv.mkDerivation rec { inherit (ghc.meta) license platforms; }; -} +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +})