diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-16 21:39:44 +0200 |
---|---|---|
committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-16 21:39:44 +0200 |
commit | 9e5896496cfd5da5754018887f7ad3b256b3ad80 (patch) | |
tree | d16fadfe61a00d589289f72f27718ea70d46a071 /pkgs/development/tools/build-managers/bazel/bazel_3/default.nix | |
parent | cb6ec35052306d0d78fe238852394c3976608918 (diff) | |
parent | 74b74b05550f258e9055b824eff49b15637dd917 (diff) | |
download | nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar.gz nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar.bz2 nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar.lz nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar.xz nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar.zst nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.zip |
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'pkgs/development/tools/build-managers/bazel/bazel_3/default.nix')
-rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel_3/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 5b20ece7680..fd29102b7e5 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -371,7 +371,7 @@ stdenv.mkDerivation rec { # libcxx includes aren't added by libcxx hook # https://github.com/NixOS/nixpkgs/pull/41589 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1" # don't use system installed Xcode to run clang, use Nix clang instead sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ |