@@ -1,10 +1,11 @@
11{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper
2−, jdk, zip, unzip, bash, writeCBin, coreutils
2+, zip, unzip, bash, writeCBin, coreutils
33, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils
44# Apple dependencies
55, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
66# Allow to independently override the jdks used to build and run respectively
7−, buildJdk ? jdk, runJdk ? jdk
7+, buildJdk, runJdk
8+, buildJdkName
89# Always assume all markers valid (don't redownload dependencies).
910# Also, don't clean up environment variables.
1011, enableNixHacks ? false
@@ -53,6 +54,9 @@ let
5354 #
5455 [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ];
5556
57+ # Java toolchain used for the build and tests
58+ javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
59+
5660in
5761stdenv.mkDerivation rec {
5862
@@ -177,11 +181,6 @@ stdenv.mkDerivation rec {
177181 substituteInPlace scripts/bootstrap/compile.sh \
178182 --replace /bin/sh ${customBash}/bin/bash
179183
180− # We only build with JDK8 for now, since JDK11 does not compile bazel
181− substituteInPlace tools/jdk/default_java_toolchain.bzl \
182− --replace '"jvm_opts": JDK9_JVM_OPTS' \
183− '"jvm_opts": JDK8_JVM_OPTS'
184−
185184 # add nix environment vars to .bazelrc
186185 cat >> .bazelrc <<EOF
187186 build --experimental_distdir=${distDir}
@@ -191,6 +190,7 @@ stdenv.mkDerivation rec {
191190 build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
192191 build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
193192 build --host_javabase='@local_jdk//:jdk'
193+ build --host_java_toolchain='${javaToolchain}'
194194 EOF
195195
196196 # add the same environment vars to compile.sh
@@ -199,6 +199,7 @@ stdenv.mkDerivation rec {
199199 -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
200200 -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
201201 -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \
202+ -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \
202203 -i scripts/bootstrap/compile.sh
203204
204205 # --experimental_strict_action_env (which will soon become the
@@ -268,7 +269,9 @@ stdenv.mkDerivation rec {
268269 export TEST_TMPDIR=$(pwd)
269270
270271 hello_test () {
271− $out/bin/bazel test --test_output=errors \
272+ $out/bin/bazel test \
273+ --test_output=errors \
274+ --java_toolchain='${javaToolchain}' \
272275 examples/cpp:hello-success_test \
273276 examples/java-native/src/test/java/com/example/myproject:hello
274277 }