Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,16 @@ stdenv.mkDerivation rec {
dontStrip = true;
dontPatchELF = true;

# Work around an issue with the old vendored zlib and modern versions
# of Clang on macOS.
#
# Fixed in newer versions of Bazel and rules_java; see
# <https://github.com/bazelbuild/bazel/issues/25124>.
#
# Credit to Homebrew for the hack:
# <https://github.com/Homebrew/homebrew-core/blob/b61d1f7d7963c08c472d829b25de5d0a06dc4b3d/Formula/b/bazel.rb#L55-L60>
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fno-define-target-os-macros";

passthru = {
# TODO add some tests to cover basic functionality, and also tests for enableNixHacks=true (buildBazelPackage tests)
# tests = ...
Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6778,7 +6778,6 @@ with pkgs;
inherit (darwin) sigtool;
buildJdk = jdk21_headless;
runJdk = jdk21_headless;
stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv else stdenv;
bazel_self = bazel_7;
};

Expand Down
Loading