From 857b04c8ed9aa5e658b46e1ae05d19b2ed50d659 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 5 Apr 2026 19:46:47 -0400 Subject: [PATCH] darwin.diskdev_cmds: migrate to use darwin.sourceRelease --- .../darwin/by-name/di/diskdev_cmds/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix b/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix index edc71e50e868..d905e3617611 100644 --- a/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix @@ -1,15 +1,23 @@ { - lib, apple-sdk, libutil, mkAppleDerivation, removefile, + pkgs, stdenvNoCC, }: let - Libc = apple-sdk.sourceRelease "Libc"; - xnu = apple-sdk.sourceRelease "xnu"; + f = + pkgs: prev: + if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + prev.darwin.sourceRelease + else + f pkgs.stdenv.__bootPackages pkgs; + bootstrapSourceRelease = f pkgs pkgs; + # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version. + Libc = bootstrapSourceRelease "Libc"; + xnu = bootstrapSourceRelease "xnu"; privateHeaders = stdenvNoCC.mkDerivation { name = "diskdev_cmds-deps-private-headers";