Merge #171611: gcc11: revert to 11.2.0 on aarch64-darwin

...into staging-next
main
Vladimír Čunát 2 years ago
commit a97b262ba6
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
  1. 11
      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;

Loading…
Cancel
Save