From 2f51e776b5653c04ce7520df5ec67e75ac6c7d46 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sat, 27 Jul 2024 10:41:59 -0700
Subject: [PATCH] freshBootstrapTools: extract bootstrapFiles as a passthru on
 its core derivation

---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix   |  7 +------
 pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 075e3aeec1d1..0a81b86be5ea 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -25,12 +25,7 @@ in
 
 rec {
   build = pkgs.callPackage ./stdenv-bootstrap-tools.nix { };
-  bootstrapFiles = {
-    bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz";
-    unpack = pkgs.runCommand "unpack" { allowedReferences = []; } ''
-      cp -r ${build}/unpack $out
-    '';
-  };
+  inherit (build) bootstrapFiles;
 
   bootstrapTools = pkgs.callPackage ./bootstrap-tools.nix {
     inherit (bootstrapFiles) bootstrapTools unpack;
diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix
index 0aa15d526f9f..0ad585ebd354 100644
--- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix
@@ -29,12 +29,13 @@
   openssl,
   patch,
   pbzx,
+  runCommand,
   writeText,
   xar,
   xz,
   zlib,
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   name = "stdenv-bootstrap-tools";
 
   nativeBuildInputs = [
@@ -290,7 +291,16 @@ stdenv.mkDerivation {
 
   allowedReferences = [ ];
 
+  passthru = {
+    bootstrapFiles = {
+      bootstrapTools = "${finalAttrs.finalPackage}/on-server/bootstrap-tools.tar.xz";
+      unpack = runCommand "unpack" { allowedReferences = [ ]; } ''
+        cp -r ${finalAttrs.finalPackage}/unpack $out
+      '';
+    };
+  };
+
   meta = {
     maintainers = [ lib.maintainers.copumpkin ];
   };
-}
+})