diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
commit | f34a1b70eb86e4a63cfb88ea460345bb1aed88e3 (patch) | |
tree | 32834d23912250e0c4b86aa4420baacf8091c0fe /nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix | |
parent | 003ab91dd67b093890db1dd0bab564345db6e496 (diff) | |
parent | 7a7cfff8915e06365bc2365ff33d4d413184fa9f (diff) | |
download | nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.gz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.bz2 nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.lz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.xz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.zst nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix')
-rw-r--r-- | nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix index e42e0cde7665..91fade474d6f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -1,9 +1,9 @@ -{ - bazel +{ bazel , bazelTest , bazel-examples , stdenv , darwin +, extraBazelArgs ? "" , lib , openjdk8 , jdk11_headless @@ -48,17 +48,20 @@ let bazelScript = '' ${bazel}/bin/bazel \ run \ + --announce_rc \ + ${lib.optionalString (lib.strings.versionOlder "5.0.0" bazel.version) + "--toolchain_resolution_debug='@bazel_tools//tools/jdk:(runtime_)?toolchain_type'" + } \ --distdir=${distDir} \ --verbose_failures \ --curses=no \ - --sandbox_debug \ --strict_java_deps=off \ //:ProjectRunner \ '' + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") '' --host_javabase='@local_jdk//:jdk' \ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ --javabase='@local_jdk//:jdk' \ - ''; + '' + extraBazelArgs; }; in testBazel |