cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #294805 from wegank/bazel-4-refactor

Browse source 
bazel_{4,5,6}: refactor stdenv override
This commit is contained in:
Weijia Wang 2024-03-10 23:45:26 +01:00 committed by GitHub
commit d3bb925a5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/top-level/all-packages.nix
View file

@ -18344,29 +18344,34 @@ with pkgs;
buildJdk = jdk11_headless; buildJdk = jdk11_headless;
buildJdkName = "java11"; buildJdkName = "java11";
runJdk = jdk11_headless; 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_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) cctools sigtool;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk11_headless; buildJdk = jdk11_headless;
runJdk = 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_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) cctools;
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk11_headless; buildJdk = jdk11_headless;
runJdk = jdk11_headless; runJdk = jdk11_headless;
stdenv = if stdenv.isDarwin then stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv
darwin.apple_sdk_11_0.stdenv else else if stdenv.cc.isClang then llvmPackages.stdenv
if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; else if stdenv.cc.isGNU then gcc12Stdenv
else stdenv;
bazel_self = bazel_6; bazel_self = bazel_6;
}); };
bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 { bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 {
inherit (darwin) cctools sigtool; inherit (darwin) cctools sigtool;