diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix index 582817cca070..fe160259f2b3 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix @@ -107,7 +107,15 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; - patches = lib.optionals stdenv.isDarwin [ + 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 + ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; |