JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #189754: gcc12: switch to Homebrew patch on aarch64-darwin

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2022-09-07 14:45:11 +02:00
commit 930318389d
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/gcc/12/default.nix
View File

@ -63,11 +63,9 @@ let majorVersion = "12";
../gcc-12-gfortran-driving.patch
../ppc-musl.patch
] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch {
# TODO: switch back to Homebrew patches:
# was "https://github.com/Homebrew/formula-patches/raw/76677f2b/gcc/gcc-12.1.0-arm.diff"
name = "gcc-12-darwin-aarch64-support.patch";
url = "https://github.com/tjni/gcc-12-branch/compare/releases/gcc-12.2...gcc-12-2-darwin.diff";
sha256 = "sha256-hjM9q6tsdzoGOQWJ7v3BaeVxdWQGTaEnep2ZSwX5+74=";
url = "https://github.com/Homebrew/formula-patches/raw/1d184289/gcc/gcc-12.2.0-arm.diff";
sha256 = "sha256-omclLslGi/2yCV4pNBMaIpPDMW3tcz/RXdupbNbeOHA=";
})
++ optional langD ../libphobos.patch