Skip to content

Commit

Permalink
bazel_7: use new apple sdk pattern
Browse files Browse the repository at this point in the history
  • Loading branch information
wegank committed Jan 3, 2025
1 parent 454225c commit e5273b7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
11 changes: 0 additions & 11 deletions pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@
libcxx,
libtool,
sigtool,
CoreFoundation,
CoreServices,
Foundation,
IOKit,
# Allow to independently override the jdks used to build and run respectively
buildJdk,
runJdk,
Expand Down Expand Up @@ -410,10 +406,6 @@ stdenv.mkDerivation rec {
# Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
export GCOV=${coreutils}/bin/false
# Framework search paths aren't added by bintools hook
# https://github.com/NixOS/nixpkgs/pull/41914
export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks -F${IOKit}/Library/Frameworks"
# libcxx includes aren't added by libcxx hook
# https://github.com/NixOS/nixpkgs/pull/41589
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1"
Expand Down Expand Up @@ -564,9 +556,6 @@ stdenv.mkDerivation rec {
++ lib.optionals (stdenv.hostPlatform.isDarwin) [
cctools
libcxx
Foundation
CoreFoundation
CoreServices
];

# Bazel makes extensive use of symlinks in the WORKSPACE.
Expand Down
6 changes: 1 addition & 5 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7738,14 +7738,10 @@ with pkgs;
bazel_self = bazel_6;
};

bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 {
bazel_7 = callPackage ../development/tools/build-managers/bazel/bazel_7 {
inherit (darwin) sigtool;
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit;
buildJdk = jdk21_headless;
runJdk = jdk21_headless;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv
else if stdenv.cc.isClang then llvmPackages.stdenv
else stdenv;
bazel_self = bazel_7;
};

Expand Down

0 comments on commit e5273b7

Please sign in to comment.