diff options
| author | Andreas Herrmann <andreash87@gmx.ch> | 2019-08-19 14:09:59 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2019-10-11 21:44:28 +0200 |
| commit | d132d47199b8f89486e6f1f514a2938a50e735fa (patch) | |
| tree | 8d077f0939f7fbf2476a082218a6c90a20e1c6a6 /pkgs/development/tools/build-managers | |
| parent | 7429acdea1c5b8abc60ebada23112ccd2dd6a313 (diff) | |
| download | nixlib-d132d47199b8f89486e6f1f514a2938a50e735fa.tar nixlib-d132d47199b8f89486e6f1f514a2938a50e735fa.tar.gz nixlib-d132d47199b8f89486e6f1f514a2938a50e735fa.tar.bz2 nixlib-d132d47199b8f89486e6f1f514a2938a50e735fa.tar.lz nixlib-d132d47199b8f89486e6f1f514a2938a50e735fa.tar.xz nixlib-d132d47199b8f89486e6f1f514a2938a50e735fa.tar.zst nixlib-d132d47199b8f89486e6f1f514a2938a50e735fa.zip | |
bazel: shebang-test: pass bazel dir in Nix
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/shebang-test.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 352b79f21b6f..c0ff09d09767 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -208,7 +208,6 @@ stdenv.mkDerivation rec { # about why to create a subdir for the workspace. cp -r ${workspaceDir} wd && chmod u+w wd && cd wd - BAZEL_EXTRACTED=${be.install_dir} ${bazelScript} touch $out @@ -224,7 +223,7 @@ stdenv.mkDerivation rec { }; in { - shebang = callPackage ./shebang-test.nix { inherit runLocal bazelTest distDir; }; + shebang = callPackage ./shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; }; cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; diff --git a/pkgs/development/tools/build-managers/bazel/shebang-test.nix b/pkgs/development/tools/build-managers/bazel/shebang-test.nix index 98ec9a67c156..8610b036f2cc 100644 --- a/pkgs/development/tools/build-managers/bazel/shebang-test.nix +++ b/pkgs/development/tools/build-managers/bazel/shebang-test.nix @@ -2,6 +2,7 @@ bazel , bazelTest , distDir +, extracted , runLocal , unzip }: @@ -26,6 +27,7 @@ let { grep -Re '#!/usr/bin' $dir && FAIL=1; } || true { grep -Re '#![^[:space:]]*/bin/env python' $dir && FAIL=1; } || true } + BAZEL_EXTRACTED=${extracted bazel}/install check_shebangs $BAZEL_EXTRACTED while IFS= read -r -d "" zip; do unzipped="./$zip/UNPACKED" |