haskellPackages.ghc8102: add patch to allow Block.h compile with c++ compilers
This commit is contained in:
parent
272744825d
commit
888b9587ed
1 changed files with 7 additions and 1 deletions
|
@ -2,7 +2,7 @@
|
|||
|
||||
# build-tools
|
||||
, bootPkgs
|
||||
, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
|
||||
, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
|
||||
, bash
|
||||
|
||||
, libiconv ? null, ncurses
|
||||
|
@ -110,6 +110,12 @@ stdenv.mkDerivation (rec {
|
|||
# https://gitlab.haskell.org/ghc/ghc/-/issues/18549
|
||||
patches = [
|
||||
./issue-18549.patch
|
||||
] ++ stdenv.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";
|
||||
sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
|
Loading…
Reference in a new issue