darwin.mkAppleDerivation: drop support for noCC and noBootstrap

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.
This commit is contained in:
Emily
2025-10-18 02:53:30 +01:00
parent d5778a03d3
commit 68f71ff8f5
2 changed files with 1 additions and 12 deletions
@@ -19,8 +19,6 @@ mkAppleDerivation (finalAttrs: {
./patches/0001-Support-setting-an-upper-bound-on-versions.patch
];
noCC = true;
nativeBuildInputs = [ unifdef ];
buildPhase = ''
@@ -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;