diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-06-14 17:37:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-14 17:37:06 -0400 |
| commit | 493ce3b2c4c4a758818e0f90c61c39f550ec0f0e (patch) | |
| tree | 292822465a895df480db75cccaf29e0e6a71600a /pkgs | |
| parent | 85286b20921076602305a388cc8f28f4140c53c9 (diff) | |
| parent | 3d811ff18b4fa66e89a40f48eda6caa457119014 (diff) | |
| download | nixlib-493ce3b2c4c4a758818e0f90c61c39f550ec0f0e.tar nixlib-493ce3b2c4c4a758818e0f90c61c39f550ec0f0e.tar.gz nixlib-493ce3b2c4c4a758818e0f90c61c39f550ec0f0e.tar.bz2 nixlib-493ce3b2c4c4a758818e0f90c61c39f550ec0f0e.tar.lz nixlib-493ce3b2c4c4a758818e0f90c61c39f550ec0f0e.tar.xz nixlib-493ce3b2c4c4a758818e0f90c61c39f550ec0f0e.tar.zst nixlib-493ce3b2c4c4a758818e0f90c61c39f550ec0f0e.zip | |
Merge pull request #42050 from obsidiansystems/fix-ios-ghc
ghc8.4: build statically on prebuilt iOS
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.2.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.3.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index d793f0b391af..ac8d76c63ed6 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.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 ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt + enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt , # Whetherto build terminfo. enableTerminfo ? !targetPlatform.isWindows diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 385c33c22ef8..c57058a63520 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -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 + enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt , # Whetherto build terminfo. enableTerminfo ? !targetPlatform.isWindows |