diff options
| author | Guillaume Bouchard <guillaume.bouchard@tweag.io> | 2019-12-05 10:39:52 +0100 |
|---|---|---|
| committer | Guillaume Bouchard <guillaume.bouchard@tweag.io> | 2019-12-05 11:16:47 +0100 |
| commit | 0cffa85d571ffa8d36acb5b643e2ecb6a039e5e9 (patch) | |
| tree | 6035c9142e193ba1aab13cb1b1401cccccca0193 /pkgs/development/tools/build-managers | |
| parent | 5b9e350fd4a0cdea5e27bdcf08a649e95be3d020 (diff) | |
| download | nixlib-0cffa85d571ffa8d36acb5b643e2ecb6a039e5e9.tar nixlib-0cffa85d571ffa8d36acb5b643e2ecb6a039e5e9.tar.gz nixlib-0cffa85d571ffa8d36acb5b643e2ecb6a039e5e9.tar.bz2 nixlib-0cffa85d571ffa8d36acb5b643e2ecb6a039e5e9.tar.lz nixlib-0cffa85d571ffa8d36acb5b643e2ecb6a039e5e9.tar.xz nixlib-0cffa85d571ffa8d36acb5b643e2ecb6a039e5e9.tar.zst nixlib-0cffa85d571ffa8d36acb5b643e2ecb6a039e5e9.zip | |
bazel: remove wrapProgram and move it to system configuration
This way, custom configurations are all at the same place. Also, user may override these settings using the command line.
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 7a5ca2f90d2a..6d8eb56bdf33 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -132,6 +132,7 @@ let text = '' build --override_repository=${remote_java_tools.name}=${remote_java_tools} build --distdir=${distDir} + startup --server_javabase=${runJdk} ''; }; @@ -484,8 +485,6 @@ stdenv.mkDerivation rec { cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel mv ./bazel_src/output/bazel $out/bin/bazel-real - wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}" - # shell completion files mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel |