diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2018-10-01 20:47:27 +0000 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2018-10-01 20:54:21 +0000 |
| commit | b19113380f0de343e4b18ae06ef5fd64681caa55 (patch) | |
| tree | 21b863cb3c254dfd0f7758de3c2353a8ef710812 /pkgs/development/compilers | |
| parent | cb442d93459a16812fd2ae5d3598223ca799a198 (diff) | |
| download | nixlib-b19113380f0de343e4b18ae06ef5fd64681caa55.tar nixlib-b19113380f0de343e4b18ae06ef5fd64681caa55.tar.gz nixlib-b19113380f0de343e4b18ae06ef5fd64681caa55.tar.bz2 nixlib-b19113380f0de343e4b18ae06ef5fd64681caa55.tar.lz nixlib-b19113380f0de343e4b18ae06ef5fd64681caa55.tar.xz nixlib-b19113380f0de343e4b18ae06ef5fd64681caa55.tar.zst nixlib-b19113380f0de343e4b18ae06ef5fd64681caa55.zip | |
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.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 10 |
1 files 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 6a1914a9c2c8..caf5b941f7c0 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; +}) |