diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-24 00:02:42 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-24 00:02:42 +0000 |
commit | cd6a5f6c469fc98dc2c4067e37be33870549c753 (patch) | |
tree | a23d65e627240559fc2b1bd04aa457bcc7975d57 /pkgs/development/compilers/gcc/11/default.nix | |
parent | 46d29bdaecc289e749bc6c0b80002dfa8fc82169 (diff) | |
parent | 727e365f0276012d719f0e6c95ba0f0a53c9099a (diff) | |
download | nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar.gz nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar.bz2 nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar.lz nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar.xz nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar.zst nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/gcc/11/default.nix')
-rw-r--r-- | pkgs/development/compilers/gcc/11/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 81c1b94b90b..20da9a97aa5 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -78,6 +78,8 @@ let majorVersion = "11"; sha256 = "sha256-LFAXUEoYD7YeCG8V9mWanygyQOI7U5OhCRIKOVCCDAg="; }) ] + # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 + ++ optional (stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; |