about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Leach <dev@mattleach.net>2022-04-08 16:26:54 +0100
committerMatthew Leach <dev@mattleach.net>2022-04-08 16:26:54 +0100
commit8cb7f599f9e488f7e0ed320ab8d437b488ba079a (patch)
tree0df328192004e69eeb1dc8e10f962b9c1ab0cd5f
parentf35d4e3c73eaecfa5d1eabdcfd14d8047b440a15 (diff)
haskell.compiler.ghc902: fix seperate bin outputs on aarch64-darwin
-rw-r--r--pkgs/development/compilers/ghc/9.0.2.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix
index 0968b85399224..1f94dd3bbde29 100644
--- a/pkgs/development/compilers/ghc/9.0.2.nix
+++ b/pkgs/development/compilers/ghc/9.0.2.nix
@@ -192,6 +192,15 @@ 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) [
+
+    # Prevent the paths module from emitting symbols that we don't use
+    # when building with separate outputs.
+    #
+    # These cause problems as they're not eliminated by GHC's dead code
+    # elimination on aarch64-darwin. (see
+    # https://github.com/NixOS/nixpkgs/issues/140774 for details).
+    ./cabal-paths.patch
   ];
 
   postPatch = "patchShebangs .";