public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42412 from obsidiansystems/even-more-android-fixes

Browse Source 
Even more android fixes
This commit is contained in:
Matthew Justin Bauer
2018-06-25 19:09:29 -04:00
committed by GitHub
parent 889bb6873d 69cad91b5c
commit 09c66f4045
7 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/ghc/8.4.3.nix
View File

@@ -22,7 +22,7 @@
, # Whether to build dynamic libs for the standard library (on the target
# platform). Static libs are always built.
enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt
enableShared ? !targetPlatform.isWindows && !targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo.
enableTerminfo ? !targetPlatform.isWindows
@@ -75,7 +75,7 @@ let
targetCC = builtins.head toolsForTarget;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
version = "8.4.3";
name = "${targetPrefix}ghc-${version}";
@@ -209,4 +209,8 @@ stdenv.mkDerivation rec {
inherit (ghc.meta) license platforms;
};
}
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
dontStrip = true;
dontPatchELF = true;
noAuditTmpdir = true;
})