pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #177507 from ylecornec/ylecornec/bazel_dependencies_path

Bazel runtime dependencies in PATH

authored by Uri Baghin and committed by GitHub 7e1209a5 759472ac

+16 -15
unified split
+8 -7
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
··· 257 257 runLocal = name: attrs: script: 258 258 let 259 259 attrs' = removeAttrs attrs [ "buildInputs" ]; 260 - buildInputs = [ python3 which ] ++ (attrs.buildInputs or []); 260 + buildInputs = attrs.buildInputs or []; 261 261 in 262 262 runCommandCC name ({ 263 263 inherit buildInputs; ··· 323 323 324 324 in (if !stdenv.hostPlatform.isDarwin then { 325 325 # `extracted` doesn’t work on darwin 326 - shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; 326 + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self; }; 327 327 } else {}) // { 328 - bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; 329 - cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; 330 - java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; 331 - protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; 332 - pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; 328 + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; 329 + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; }; 330 + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; }; 331 + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; 332 + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; 333 333 334 334 bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; 335 335 ··· 591 591 # The binary _must_ exist with this naming if your project contains a .bazelversion 592 592 # file. 593 593 cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel 594 + wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath} 594 595 mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} 595 596 596 597 mkdir $out/share
+8 -8
pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
··· 219 219 runLocal = name: attrs: script: 220 220 let 221 221 attrs' = removeAttrs attrs [ "buildInputs" ]; 222 - buildInputs = [ python3 which ] ++ (attrs.buildInputs or []); 222 + buildInputs = attrs.buildInputs or []; 223 223 in 224 224 runCommandCC name ({ 225 225 inherit buildInputs; ··· 285 285 286 286 in (if !stdenv.hostPlatform.isDarwin then { 287 287 # `extracted` doesn’t work on darwin 288 - shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; 288 + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self;}; 289 289 } else {}) // { 290 - bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; 291 - cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; 292 - java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; 293 - protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; 294 - pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; 290 + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;}; 291 + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; 292 + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; 293 + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; 294 + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;}; 295 295 296 296 bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; 297 297 ··· 586 586 # The binary _must_ exist with this naming if your project contains a .bazelversion 587 587 # file. 588 588 cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel 589 + wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath} 589 590 mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} 590 591 591 592 mkdir $out/share ··· 662 663 dontStrip = true; 663 664 dontPatchELF = true; 664 665 } 665 -