diff options
author | sternenseemann <sternenseemann@systemli.org> | 2021-12-29 12:47:15 +0100 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2022-01-04 12:10:00 +0100 |
commit | e3c61654cabc688f2676c9ca3a595aaf54f310e0 (patch) | |
tree | b4497e2b80de32813c9a073549a29fe3d7ff1f5f | |
parent | 44a74d1b8f75f71cbe4320c9c34690a5e8565936 (diff) | |
download | nixpkgs-e3c61654cabc688f2676c9ca3a595aaf54f310e0.tar nixpkgs-e3c61654cabc688f2676c9ca3a595aaf54f310e0.tar.gz nixpkgs-e3c61654cabc688f2676c9ca3a595aaf54f310e0.tar.bz2 nixpkgs-e3c61654cabc688f2676c9ca3a595aaf54f310e0.tar.lz nixpkgs-e3c61654cabc688f2676c9ca3a595aaf54f310e0.tar.xz nixpkgs-e3c61654cabc688f2676c9ca3a595aaf54f310e0.tar.zst nixpkgs-e3c61654cabc688f2676c9ca3a595aaf54f310e0.zip |
haskell.compiler.*: disable large address space only on iOS
The condition used in the past to detect iOS was "is this aarch64-darwin"? Since we have aarch64-darwin devices running macOS nowadays which do allow large address space, let's use the more accurate flag.
-rw-r--r-- | pkgs/development/compilers/ghc/8.10.7.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.8.4.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.0.2.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.2.1.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 40b57223fa1..d21ac4411f1 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -57,7 +57,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: assert !enableIntegerSimple -> gmp != null; diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 3ce47a20bad..8a352d0e0a9 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -56,7 +56,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: assert !enableIntegerSimple -> gmp != null; diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 7d58b550a99..8ca5df08515 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -58,7 +58,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: assert !enableIntegerSimple -> gmp != null; diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index 77d741a4f2b..4714a19a535 100644 --- a/pkgs/development/compilers/ghc/9.2.1.nix +++ b/pkgs/development/compilers/ghc/9.2.1.nix @@ -59,7 +59,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: assert !enableIntegerSimple -> gmp != null; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a7696479401..1c4bf3059d5 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -64,7 +64,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: assert !enableNativeBignum -> gmp != null; |