From 38835c82566164a08de5b95531a65ca4a261ec1b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 7 Nov 2024 19:08:21 +0000
Subject: [PATCH 1/2] stdenv/darwin: add `darwin.{libutil,copyfile}` to SDK
 packages

---
 pkgs/stdenv/darwin/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 6f8ffaec92f1..cce15dff2b7b 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -349,9 +349,11 @@ let
     inherit (prevStage.darwin)
       Csu
       adv_cmds
+      copyfile
       libiconv
       libresolv
       libsbuf
+      libutil
       system_cmds
       ;
   };

From a061b02a6fc13985524e3fb5bf1da25b950d42ef Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 7 Nov 2024 19:07:30 +0000
Subject: [PATCH 2/2] Revert "python{27,39,310,311,312,313,314}: use a
 bootstrap SDK on Darwin"

No longer necessary to mask an unwanted Python rebuild.

This reverts commit c455166b5f3e62357fd0c40be2721dd78c36cfca.
---
 pkgs/development/interpreters/python/cpython/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index a7b34e3329d1..20c7c0c145ef 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -180,7 +180,7 @@ let
     darwin.apple_sdk.frameworks.Cocoa
   ] ++ optionals stdenv.hostPlatform.isDarwin [
     # Work around for ld64 crashes on x86_64-darwin. Remove once 11.0 becomes the default.
-    (apple-sdk_11.override { enableBootstrap = true; })
+    apple-sdk_11
   ] ++ optionals stdenv.hostPlatform.isMinGW [
     windows.dlfcn
     windows.mingw_w64_pthreads