diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-08-12 15:56:04 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-08-17 23:51:59 -0500 |
| commit | 0be29459d689b1b8adf79a3d74085ba9006c9cf4 (patch) | |
| tree | ae0d5d1cedf9b330487803a0a1cbaf0bda3c8186 | |
| parent | 074bc78cc8749faa31729096b65f2ef51b10abeb (diff) | |
| download | nixpkgs-0be29459d689b1b8adf79a3d74085ba9006c9cf4.tar nixpkgs-0be29459d689b1b8adf79a3d74085ba9006c9cf4.tar.gz nixpkgs-0be29459d689b1b8adf79a3d74085ba9006c9cf4.tar.bz2 nixpkgs-0be29459d689b1b8adf79a3d74085ba9006c9cf4.tar.lz nixpkgs-0be29459d689b1b8adf79a3d74085ba9006c9cf4.tar.xz nixpkgs-0be29459d689b1b8adf79a3d74085ba9006c9cf4.tar.zst nixpkgs-0be29459d689b1b8adf79a3d74085ba9006c9cf4.zip | |
ghc: set Stage1Only = YES on iOS
We want stage1Only here even if system == system, since we can’t run the native arch simulator binaries locally.
| -rw-r--r-- | pkgs/development/compilers/ghc/8.10.1.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.5.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.8.2.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.8.3.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.8.4.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 727fc91451e..c0bcdaa6bee 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -63,7 +63,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index 06266556cf3..863fc74c037 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -60,7 +60,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index 305226b3407..af5c5433f1b 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -60,7 +60,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index aa4c378f200..f6b0a8efdf2 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -63,7 +63,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 60c0f2cdd9d..6efbef45bac 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -63,7 +63,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 4b9ff94963d..5d8b250d41d 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -66,7 +66,7 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO |