diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-04 00:45:26 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-07 19:43:46 -0400 |
| commit | 81a9b46ee8d8df17839bdccfef4c4f58864f4586 (patch) | |
| tree | 94eb75d3da08795aafff7df6b0233641cb5fa734 /pkgs/development/tools/build-managers/bazel/default.nix | |
| parent | 2c89c2401504201e2583762ae57ae468ff4c3b90 (diff) | |
| download | nixpkgs-81a9b46ee8d8df17839bdccfef4c4f58864f4586.tar nixpkgs-81a9b46ee8d8df17839bdccfef4c4f58864f4586.tar.gz nixpkgs-81a9b46ee8d8df17839bdccfef4c4f58864f4586.tar.bz2 nixpkgs-81a9b46ee8d8df17839bdccfef4c4f58864f4586.tar.lz nixpkgs-81a9b46ee8d8df17839bdccfef4c4f58864f4586.tar.xz nixpkgs-81a9b46ee8d8df17839bdccfef4c4f58864f4586.tar.zst nixpkgs-81a9b46ee8d8df17839bdccfef4c4f58864f4586.zip | |
bazel: use llvm6 on darwin
https://hydra.nixos.org/build/92942635
Diffstat (limited to 'pkgs/development/tools/build-managers/bazel/default.nix')
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 1e29e4b34f0..e106c6962dc 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { sed -i -e 's/<.*\*>//g' tools/osx/xcode_locator.m # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ + sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ scripts/bootstrap/compile.sh \ src/tools/xcode/realpath/BUILD \ src/tools/xcode/stdredirect/BUILD \ @@ -256,7 +256,7 @@ stdenv.mkDerivation rec { makeWrapper which customBash - ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; # Bazel makes extensive use of symlinks in the WORKSPACE. # This causes problems with infinite symlinks if the build output is in the same location as the |