From 79660b4ef4ea65837a01af0ea6f14a3f622a7c15 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 18:28:01 +0100
Subject: [PATCH] bazel_7: use new apple sdk pattern

---
 .../tools/build-managers/bazel/bazel_7/default.nix    | 11 -----------
 pkgs/top-level/all-packages.nix                       |  6 ++----
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
index a37b28c88c17..cd9acfcfc723 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
@@ -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,
@@ -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"
@@ -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.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52fa36ad692d..ebca858d5514 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7742,13 +7742,11 @@ 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
+    stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv
       else stdenv;
     bazel_self = bazel_7;
   };