From b56ac706028bc2fb87c1775e35e34dce4ac834e0 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 1 Feb 2021 21:36:36 +0100 Subject: [PATCH] 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 --- .../tools/build-managers/bazel/bazel_4/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 137e5639f37..5482db67cae 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -106,7 +106,7 @@ let [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip python27 python3 ]; # Java toolchain used for the build and tests - javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; + javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1643088e98b..85ec0e57ad2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11737,8 +11737,8 @@ in bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8_headless; - buildJdkName = "jdk8"; + buildJdk = jdk11_headless; + buildJdkName = "java11"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; bazel_self = bazel_4;