diff options
author | sternenseemann <sternenseemann@systemli.org> | 2022-04-23 18:54:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-23 18:54:56 +0200 |
commit | 9cba3bc856e208cf2037d41ed2e087783db1ab35 (patch) | |
tree | 852f367f73b191c2c4696bd6f21af98cf110ceb5 /pkgs/development/compilers/ghc | |
parent | 9d13e15c02f46a154567bca11c24000b2318e7d1 (diff) | |
parent | eb286631b4cec28424fb4056735a79cdb36eec59 (diff) |
Merge pull request #167934 from sternenseemann/aarch64-darwin-cabal-patches-target
haskell.compiler: check targetPlatform for Cabal Paths module patch
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r-- | pkgs/development/compilers/ghc/8.10.7.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.0.2.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index fd14501097c29..cdf4faf3ffc7c 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -212,7 +212,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; }) - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 1f94dd3bbde29..a4cefe7294d89 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -192,7 +192,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423"; sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI="; }) - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. |