diff options
| author | Drew Hess <src@drewhess.com> | 2018-01-10 22:14:01 -0800 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-11 10:45:44 -0500 |
| commit | e4f3fe051e4becd7d42201fa98619c2179908b45 (patch) | |
| tree | e763e225669d9d697ab7b82dfac3debf65d1ad24 /pkgs/development/compilers/ghc | |
| parent | 888404f11bfd0c1b60904590aad56ca70e5f6d9d (diff) | |
| download | nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar.gz nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar.bz2 nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar.lz nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar.xz nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar.zst nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.zip | |
ghc, haskell-modules: ARM cross build fixes.
As requested in #33405.
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/7.10.3-binary.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/7.10.3.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.1-binary.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index b68c84711b0d..c56798e31ae4 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals stdenv.isArm [ llvm_35 ]; + buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isArm [ llvm_35 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index dd5acfa16f1f..3fb70c31a7c2 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ./relocation.patch ]; - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ] ++ stdenv.lib.optionals stdenv.isArm [ llvm_35 ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ] ++ stdenv.lib.optionals targetPlatform.isArm [ llvm_35 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index ec2694a00286..8a08ab4b9862 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ llvm_39 ]; + buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 5ef71804b570..0e87ea68649e 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (rec { sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk ''; - buildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ] ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ llvm_39 ]; + buildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ] ++ stdenv.lib.optionals (targetPlatform.isArm || targetPlatform.isAarch64) [ llvm_39 ]; enableParallelBuilding = true; |