diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2021-09-22 19:10:38 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2021-09-22 19:11:43 +0200 |
| commit | 2a1e089550d5b11e63fd692ddf10d7e64ef393be (patch) | |
| tree | 145b06009bef593099a343a43d856937ea5e2aa9 /pkgs/development/compilers/ghc | |
| parent | a63dd9b40ae40a7e9d4bc8a4b42e646159b58791 (diff) | |
| download | nixpkgs-2a1e089550d5b11e63fd692ddf10d7e64ef393be.tar nixpkgs-2a1e089550d5b11e63fd692ddf10d7e64ef393be.tar.gz nixpkgs-2a1e089550d5b11e63fd692ddf10d7e64ef393be.tar.bz2 nixpkgs-2a1e089550d5b11e63fd692ddf10d7e64ef393be.tar.lz nixpkgs-2a1e089550d5b11e63fd692ddf10d7e64ef393be.tar.xz nixpkgs-2a1e089550d5b11e63fd692ddf10d7e64ef393be.tar.zst nixpkgs-2a1e089550d5b11e63fd692ddf10d7e64ef393be.zip | |
haskell.compiler.ghc921: fix build on darwin
See https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_377768
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/9.2.1.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index b565870addb..c8eb517e997 100644 --- a/pkgs/development/compilers/ghc/9.2.1.nix +++ b/pkgs/development/compilers/ghc/9.2.1.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx, xattr +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx, xattr , bash , libiconv ? null, ncurses @@ -144,6 +144,14 @@ stdenv.mkDerivation (rec { sha256 = "1q2pppxv2avhykyxvyq72r5p97rkkiqp19b77yhp85ralbcp4ivw"; }; + patches = [ + (fetchpatch { + name = "fix-darwin-link-failure.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/77456387025ca74299ecc70621cbdb62b1b6ffc9.patch"; + sha256 = "1g8smrn7hj8cbp9fhrylvmrb15s0xd8lhdgxqnx0asnd4az82gj8"; + }) + ]; + enableParallelBuilding = true; outputs = [ "out" "doc" ]; @@ -311,9 +319,7 @@ stdenv.mkDerivation (rec { # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. # Linker failure on macOS: # https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726 - broken = (enableIntegerSimple && hostPlatform.isMusl) - || stdenv.hostPlatform.isDarwin; - hydraPlatforms = lib.remove "x86_64-darwin" ghc.meta.platforms; + broken = enableIntegerSimple && hostPlatform.isMusl; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { |