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.
This commit is contained in:
Guillaume Bouchard 2019-12-05 10:39:52 +01:00
parent 5b9e350fd4
commit 0cffa85d57

View file

@ -132,6 +132,7 @@ let
text = '' text = ''
build --override_repository=${remote_java_tools.name}=${remote_java_tools} build --override_repository=${remote_java_tools.name}=${remote_java_tools}
build --distdir=${distDir} build --distdir=${distDir}
startup --server_javabase=${runJdk}
''; '';
}; };
@ -484,8 +485,6 @@ stdenv.mkDerivation rec {
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
mv ./bazel_src/output/bazel $out/bin/bazel-real mv ./bazel_src/output/bazel $out/bin/bazel-real
wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}"
# shell completion files # shell completion files
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions 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 mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel