diff options
Diffstat (limited to 'pkgs/development/tools/build-managers/bazel/bazel_1/default.nix')
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel_1/default.nix | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index ffb5714631c..eff8aede6c1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, lib, fetchurl, fetchFromGitHub , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) -, bazel_1 +, bazel_self , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater @@ -247,7 +247,7 @@ stdenv.mkDerivation rec { touch $out ''); - bazelWithNixHacks = bazel_1.override { enableNixHacks = true; }; + bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; bazel-examples = fetchFromGitHub { owner = "bazelbuild"; @@ -258,20 +258,20 @@ stdenv.mkDerivation rec { in (if !stdenv.hostPlatform.isDarwin then { # `extracted` doesn’t work on darwin - shebang = callPackage ./shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; } else {}) // { - 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; }; - protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; - - bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + 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; }; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + + bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; # downstream packages using buildBazelPackage # fixed-output hashes of the fetch phase need to be spot-checked manually |