From 68f71ff8f5c49222b34d5f460ffa1bb5e242d5a8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 18 Oct 2025 02:28:14 +0100
Subject: [PATCH] darwin.mkAppleDerivation: drop support for `noCC` and
 `noBootstrap`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was only used by `darwin.AvailabilityVersions` setting `noCC`, and
is fundamentally incompatible with `finalAttrs.finalPackage`. Better
would be to specify `stdenv` outside the derivation attributes, or
ideally move this stuff into hooks and helper functions, I think,
but for just the one package it doesn’t seem worthwhile.
---
 .../AvailabilityVersions/package.nix                  |  2 --
 .../apple-source-releases/mkAppleDerivation.nix       | 11 +----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix
index 2625f276923e..dadafd43edcb 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix
@@ -19,8 +19,6 @@ mkAppleDerivation (finalAttrs: {
     ./patches/0001-Support-setting-an-upper-bound-on-versions.patch
   ];
 
-  noCC = true;
-
   nativeBuildInputs = [ unifdef ];
 
   buildPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
index d42357f6b245..538b92d32637 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
@@ -8,8 +8,6 @@ in
   fetchFromGitHub,
   meson,
   ninja,
-  stdenv,
-  stdenvNoCC,
   xcodeProjectCheckHook,
 }:
 
@@ -21,15 +19,8 @@ lib.makeOverridable (
   let
     attrs' = if lib.isFunction attrs then attrs else _: attrs;
     attrsFixed = lib.fix attrs';
-    stdenv' =
-      if attrsFixed.noCC or false then
-        stdenvNoCC
-      else if attrsFixed.noBootstrap or false then
-        stdenv
-      else
-        bootstrapStdenv;
   in
-  stdenv'.mkDerivation (
+  bootstrapStdenv.mkDerivation (
     lib.extends (
       self: super:
       assert super ? releaseName;