mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-01 09:44:18 +00:00
bazel_{4,5,6}: refactor stdenv override
This commit is contained in:
parent
965c27d67c
commit
4a887b5f59
@ -18354,29 +18354,34 @@ with pkgs;
|
||||
buildJdk = jdk11_headless;
|
||||
buildJdkName = "java11";
|
||||
runJdk = jdk11_headless;
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else gcc10StdenvCompat;
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv
|
||||
else if stdenv.cc.isGNU then gcc10Stdenv
|
||||
else stdenv;
|
||||
bazel_self = bazel_4;
|
||||
};
|
||||
|
||||
bazel_5 = pin-to-gcc12-if-gcc13 (callPackage ../development/tools/build-managers/bazel/bazel_5 {
|
||||
bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 {
|
||||
inherit (darwin) cctools sigtool;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
|
||||
buildJdk = jdk11_headless;
|
||||
runJdk = jdk11_headless;
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv
|
||||
else if stdenv.cc.isGNU then gcc12Stdenv
|
||||
else stdenv;
|
||||
bazel_self = bazel_5;
|
||||
});
|
||||
};
|
||||
|
||||
bazel_6 = pin-to-gcc12-if-gcc13 (darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 {
|
||||
bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 {
|
||||
inherit (darwin) cctools;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation;
|
||||
buildJdk = jdk11_headless;
|
||||
runJdk = jdk11_headless;
|
||||
stdenv = if stdenv.isDarwin then
|
||||
darwin.apple_sdk_11_0.stdenv else
|
||||
if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv
|
||||
else if stdenv.cc.isClang then llvmPackages.stdenv
|
||||
else if stdenv.cc.isGNU then gcc12Stdenv
|
||||
else stdenv;
|
||||
bazel_self = bazel_6;
|
||||
});
|
||||
};
|
||||
|
||||
bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 {
|
||||
inherit (darwin) cctools sigtool;
|
||||
|
Loading…
Reference in New Issue
Block a user