From 816cb20bd320714b17164ba950d82736578e9984 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 4 Sep 2022 11:07:27 -0700 Subject: [PATCH] gcc12: switch to Homebrew patch on aarch64-darwin We can presume that this patch is better tested and better maintained. --- pkgs/development/compilers/gcc/12/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 4ef422c850ed..10ce704382a7 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -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