diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-10 16:27:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-10 16:27:01 +0100 |
| commit | 2d4dcefd9e8addd3bee3efb028aa5a315d531e23 (patch) | |
| tree | 98a097d187741a15201a52b77b2b06e4d5c3763a /pkgs/development | |
| parent | d5e854b646eddd59cb89ec6a604a48abf7775d27 (diff) | |
| parent | d1818ad6b10e8880f166a0c678389ea89dec88ce (diff) | |
| download | nixlib-2d4dcefd9e8addd3bee3efb028aa5a315d531e23.tar nixlib-2d4dcefd9e8addd3bee3efb028aa5a315d531e23.tar.gz nixlib-2d4dcefd9e8addd3bee3efb028aa5a315d531e23.tar.bz2 nixlib-2d4dcefd9e8addd3bee3efb028aa5a315d531e23.tar.lz nixlib-2d4dcefd9e8addd3bee3efb028aa5a315d531e23.tar.xz nixlib-2d4dcefd9e8addd3bee3efb028aa5a315d531e23.tar.zst nixlib-2d4dcefd9e8addd3bee3efb028aa5a315d531e23.zip | |
Merge pull request #46465 from uri-canva/bazel-jdk10
bazel: add bazel_jdk10 variant
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 6a25aef8b36a..49d6abdc0098 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,11 +1,13 @@ { stdenv, lib, fetchurl, fetchpatch, runCommand, makeWrapper , jdk, zip, unzip, bash, writeCBin, coreutils , which, python, perl, gnused, gnugrep, findutils +# Apple dependencies +, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation +# Allow to independently override the jdks used to build and run respectively +, buildJdk ? jdk, runJdk ? jdk # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false -# Apple dependencies -, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation }: let @@ -152,7 +154,7 @@ stdenv.mkDerivation rec { + genericPatches; buildInputs = [ - jdk + buildJdk ]; nativeBuildInputs = [ @@ -190,7 +192,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mv output/bazel $out/bin - wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}" + wrapProgram "$out/bin/bazel" --set JAVA_HOME "${runJdk}" mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ |