summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorBenjamin Staffin <benley@gmail.com>2018-07-27 14:45:43 -0400
committerGitHub <noreply@github.com>2018-07-27 14:45:43 -0400
commit28e11a0b6ba740aedcc8be27ff8ef334d187bd37 (patch)
tree7c59a2cfbaa3f6bb1b02f619888de5fbe091f8bb /pkgs/development/tools
parent9cbe75b269eeb91be11a50ecd71f942c56897b42 (diff)
downloadnixlib-28e11a0b6ba740aedcc8be27ff8ef334d187bd37.tar
nixlib-28e11a0b6ba740aedcc8be27ff8ef334d187bd37.tar.gz
nixlib-28e11a0b6ba740aedcc8be27ff8ef334d187bd37.tar.bz2
nixlib-28e11a0b6ba740aedcc8be27ff8ef334d187bd37.tar.lz
nixlib-28e11a0b6ba740aedcc8be27ff8ef334d187bd37.tar.xz
nixlib-28e11a0b6ba740aedcc8be27ff8ef334d187bd37.tar.zst
nixlib-28e11a0b6ba740aedcc8be27ff8ef334d187bd37.zip
bazel: fix bash completion, halve build time (#44097)
This finally fixes the build to avoid having to completely rebuild
bazel from source a second time just to generate the bash completion
script!

It also makes completion actually _work_ for bash users by
correcting the name of the installed script.
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/build-managers/bazel/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 63b059935874..56b64cd061b5 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -128,10 +128,10 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     export TMPDIR=/tmp/.bazel-$UID
     ./compile.sh
-    ./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \
-      --spawn_strategy=standalone \
-      --genrule_strategy=standalone
-    cp bazel-bin/scripts/bazel-complete.bash output/
+    scripts/generate_bash_completion.sh \
+        --bazel=./output/bazel \
+        --output=output/bazel-complete.bash \
+        --prepend=scripts/bazel-complete-template.bash
   '';
 
   # Build the CPP and Java examples to verify that Bazel works.
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
     mv output/bazel $out/bin
     wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}"
     mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
-    mv output/bazel-complete.bash $out/share/bash-completion/completions/
+    mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel
     cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
   '';