From a86fe917b947acf18cf8c630c55f877389fa6fad Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 21 Oct 2017 17:11:02 +0300 Subject: [PATCH] bazel_0_4: try to fix on Darwin First round of fixes -- let's see how Hydra reacts. --- pkgs/development/tools/build-managers/bazel/0.4.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index 0b25623511a..870882a84cc 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -38,6 +38,13 @@ stdenv.mkDerivation rec { for f in $(grep -l -r '/usr/bin/env'); do substituteInPlace "$f" --replace '/usr/bin/env' '${coreutils}/bin/env' done + '' + lib.optionalString stdenv.isDarwin '' + sed -i 's,/usr/bin/xcrun clang,clang,g' \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + src/tools/xcode/xcrunwrapper/xcrunwrapper.sh + sed -i 's/"xcrun", "clang"/"clang"/g' tools/osx/xcode_configure.bzl ''; buildInputs = [