From ec87e38d65d4ea1fa7ab76c7efe70098e36769d0 Mon Sep 17 00:00:00 2001
From: Thomas Watson <twatson52@icloud.com>
Date: Wed, 4 May 2022 23:11:45 -0500
Subject: [PATCH] Revert "gcc: 11.2.0 -> 11.3.0" for aarch64-darwin
Patches to support GCC 11.3.0 on aarch64-darwin are not available. Homebrew
also is skipping the 11.3.0 upgrade.
---
pkgs/development/compilers/gcc/11/default.nix | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix
index 740505062027..ba4b10cf73ea 100644
--- a/pkgs/development/compilers/gcc/11/default.nix
+++ b/pkgs/development/compilers/gcc/11/default.nix
@@ -52,7 +52,12 @@ with lib;
with builtins;
let majorVersion = "11";
- version = "${majorVersion}.3.0";
+ # The patch below for aarch64-darwin does not apply to 11.3.0 and an
+ # updated version is not available. Keep aarch64-darwin on 11.2.0 so the
+ # large body of packages which depend on gfortran are still functional
+ # until GCC 12 is the default.
+ version = if (stdenv.isDarwin && stdenv.isAarch64) then
+ "${majorVersion}.2.0" else "${majorVersion}.3.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -91,7 +96,9 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
- sha256 = "sha256-tHzygYaR9bHiHfK7OMeV+sLPvWQO3i0KXhyJ4zijrDk=";
+ sha256 = if (stdenv.isDarwin && stdenv.isAarch64)
+ then "sha256-0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os="
+ else "sha256-tHzygYaR9bHiHfK7OMeV+sLPvWQO3i0KXhyJ4zijrDk=";
};
inherit patches;