From 508e8f3b51bcaefe1392ba4d947c19b9963ffbcf Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 5 Apr 2026 19:46:47 -0400 Subject: [PATCH] darwin.text_cmds: migrate to use darwin.sourceRelease --- .../darwin/by-name/te/text_cmds/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix b/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix index 6c71c21c1ee7..a8b44093a9a5 100644 --- a/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix @@ -1,6 +1,5 @@ { lib, - apple-sdk, bzip2, libmd, libresolv, @@ -10,17 +9,26 @@ ncurses, pkg-config, shell_cmds, + pkgs, stdenvNoCC, xz, zlib, }: let - Libc = apple-sdk.sourceRelease "Libc"; + 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"; - CommonCrypto = apple-sdk.sourceRelease "CommonCrypto"; - libplatform = apple-sdk.sourceRelease "libplatform"; - xnu = apple-sdk.sourceRelease "xnu"; + CommonCrypto = bootstrapSourceRelease "CommonCrypto"; + libplatform = bootstrapSourceRelease "libplatform"; + xnu = bootstrapSourceRelease "xnu"; privateHeaders = stdenvNoCC.mkDerivation { name = "text_cmds-deps-private-headers";