git.iko.soy/typeable/nixpkgs
on master help sign in
bazel_4: Use jdk11_headless to build bazel

Use the same JDK for building bazel and for its runtime. Effectively, the former `toolchain_hostjdk8` java toolchain has been deprecated and should no longer be used (in newer bazel)[1]: ``` default_java_toolchain( name = "toolchain_hostjdk8", ... ) ``` [1]: https://github.com/bazelbuild/bazel/blob/4fc48680653a71aacbfd555436ba8f9a0742d3d9/tools/jdk/BUILD.tools#L384-L387

commitb56ac706028bc2fb87c1775e35e34dce4ac834e0 authorClaudio Bley <cbley@exa-online.de> dateMon 1 Feb 2021, 21:36 (6 years ago) parentb461c9e
2 files changed+3−3
compare with master
unifiedsplit
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix+1−1 pkgs/top-level/all-packages.nix+2−2
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix+1−1
@@ -106,7 +106,7 @@ let
106106 [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip python27 python3 ];
107107
108108 # Java toolchain used for the build and tests
109− javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
109+ javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}";
110110
111111 platforms = lib.platforms.linux ++ lib.platforms.darwin;
112112
pkgs/top-level/all-packages.nix+2−2
@@ -11737,8 +11737,8 @@ in
1173711737 bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 {
1173811738 inherit (darwin) cctools;
1173911739 inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
11740− buildJdk = jdk8_headless;
11741− buildJdkName = "jdk8";
11740+ buildJdk = jdk11_headless;
11741+ buildJdkName = "java11";
1174211742 runJdk = jdk11_headless;
1174311743 stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
1174411744 bazel_self = bazel_4;