about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix')
-rw-r--r--nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix
index 6e194b68faa2..a42dfce6468a 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix
@@ -107,8 +107,16 @@ stdenv.mkDerivation (rec {
 
   outputs = [ "out" "doc" ];
 
-  # https://gitlab.haskell.org/ghc/ghc/-/issues/18549
   patches = [
+    # See upstream patch at
+    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
+    # from source distributions, the auto-generated configure script needs to be
+    # patched as well, therefore we use an in-tree patch instead of pulling the
+    # upstream patch. Don't forget to check backport status of the upstream patch
+    # when adding new GHC releases in nixpkgs.
+    ./respect-ar-path.patch
+
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/18549
     ./issue-18549.patch
   ] ++ lib.optionals stdenv.isDarwin [
     # Make Block.h compile with c++ compilers. Remove with the next release