diff options
Diffstat (limited to 'pkgs/development/tools/build-managers/bazel/java-test.nix')
-rw-r--r-- | pkgs/development/tools/build-managers/bazel/java-test.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix index cfdfe84f79d3..e42e0cde7665 100644 --- a/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -2,7 +2,8 @@ bazel , bazelTest , bazel-examples -, gccStdenv +, stdenv +, darwin , lib , openjdk8 , jdk11_headless @@ -18,9 +19,10 @@ let toolsBazel = writeScript "bazel" '' #! ${runtimeShell} - export CXX='${gccStdenv.cc}/bin/g++' - export LD='${gccStdenv.cc}/bin/ld' - export CC='${gccStdenv.cc}/bin/gcc' + export CXX='${stdenv.cc}/bin/clang++' + export LD='${darwin.cctools}/bin/ld' + export LIBTOOL='${darwin.cctools}/bin/libtool' + export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode # See: https://github.com/bazelbuild/bazel/issues/4231 @@ -33,7 +35,7 @@ let cp -r ${bazel-examples}/java-tutorial $out find $out -type d -exec chmod 755 {} \; '' - + (lib.optionalString gccStdenv.isDarwin '' + + (lib.optionalString stdenv.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -47,14 +49,15 @@ let ${bazel}/bin/bazel \ run \ --distdir=${distDir} \ - --verbose_failures \ - --curses=no \ - --sandbox_debug \ - //:ProjectRunner \ + --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' \ + --host_javabase='@local_jdk//:jdk' \ + --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ + --javabase='@local_jdk//:jdk' \ ''; }; |