summary refs log tree commit diff
diff options
context:
space:
mode:
authorIvan Babrou <github@ivan.computer>2021-02-15 10:19:15 -0800
committerGitHub <noreply@github.com>2021-02-15 10:19:15 -0800
commit368ed8fb3d85d5a239aefba0d3d41df47f818a56 (patch)
treedf222fda897168efafd461961e76a4e0579863e0
parentd9be3c767cbc2551f3e041add8b1a00ac10e8b21 (diff)
downloadnixpkgs-368ed8fb3d85d5a239aefba0d3d41df47f818a56.tar
nixpkgs-368ed8fb3d85d5a239aefba0d3d41df47f818a56.tar.gz
nixpkgs-368ed8fb3d85d5a239aefba0d3d41df47f818a56.tar.bz2
nixpkgs-368ed8fb3d85d5a239aefba0d3d41df47f818a56.tar.lz
nixpkgs-368ed8fb3d85d5a239aefba0d3d41df47f818a56.tar.xz
nixpkgs-368ed8fb3d85d5a239aefba0d3d41df47f818a56.tar.zst
nixpkgs-368ed8fb3d85d5a239aefba0d3d41df47f818a56.zip
go_1_14, go_1_15, go_2-dev: do not override stdenv if it is not gcc (#112248)
This doesn't do anything for existing packages, but it helps #105026,
since `aarch64-darwin` doesn't have a working gcc today.
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36730983660..4b0ad972b84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10145,21 +10145,21 @@ in
 
   go_1_14 = callPackage ../development/compilers/go/1.14.nix ({
     inherit (darwin.apple_sdk.frameworks) Security Foundation;
-  } // lib.optionalAttrs stdenv.isAarch64 {
+  } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
     stdenv = gcc8Stdenv;
     buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
   });
 
   go_1_15 = callPackage ../development/compilers/go/1.15.nix ({
     inherit (darwin.apple_sdk.frameworks) Security Foundation;
-  } // lib.optionalAttrs stdenv.isAarch64 {
+  } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
     stdenv = gcc8Stdenv;
     buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
   });
 
   go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({
     inherit (darwin.apple_sdk.frameworks) Security Foundation;
-  } // lib.optionalAttrs stdenv.isAarch64 {
+  } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
     stdenv = gcc8Stdenv;
     buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
   });