Skip to content

bazel: Fix bazel query and provide a default java toolchain #98611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Profpatsch merged 2 commits into from
Oct 19, 2020
Merged

bazel: Fix bazel query and provide a default java toolchain #98611

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b553605
bazel: Fix bazel query and provide a default java toolchain
mfarrugi Sep 24, 2020
9abecc0
format
mfarrugi Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ let
srcs.bazel_skylib
srcs.io_bazel_rules_sass
srcs.platforms
(if stdenv.hostPlatform.isDarwin
then srcs."java_tools_javac11_darwin-v8.0.zip"
else srcs."java_tools_javac11_linux-v8.0.zip")
# `bazel query` wants all of these to be available regardless of platform.
srcs."java_tools_javac11_darwin-v8.0.zip"
srcs."java_tools_javac11_linux-v8.0.zip"
srcs."java_tools_javac11_windows-v8.0.zip"
srcs."coverage_output_generator-v2.1.zip"
srcs.build_bazel_rules_nodejs
srcs."android_tools_pkg-0.19.0rc1.tar.gz"
Expand Down Expand Up @@ -131,10 +132,21 @@ let
bazelRC = writeTextFile {
name = "bazel-rc";
text = ''
build --override_repository=${remote_java_tools.name}=${remote_java_tools}
build --distdir=${distDir}
startup --server_javabase=${runJdk}

# Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054
# Most commands inherit from 'build' anyway.
build --distdir=${distDir}
fetch --distdir=${distDir}
query --distdir=${distDir}

build --override_repository=${remote_java_tools.name}=${remote_java_tools}
fetch --override_repository=${remote_java_tools.name}=${remote_java_tools}
query --override_repository=${remote_java_tools.name}=${remote_java_tools}

# Provide a default java toolchain, this will be the same as ${runJdk}
build --host_javabase='@local_jdk//:jdk'

# load default location for the system wide configuration
try-import /etc/bazel.bazelrc
'';
Expand Down Expand Up @@ -534,7 +546,7 @@ stdenv.mkDerivation rec {
export TEST_TMPDIR=$(pwd)

hello_test () {
$out/bin/bazel test --distdir=${distDir} \
$out/bin/bazel test \
--test_output=errors \
--java_toolchain='${javaToolchain}' \
examples/cpp:hello-success_test \
Expand Down