From 1441f48d9952de0dcff900bfb943b87a9d0120a7 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sat, 27 Jul 2024 10:48:42 -0700
Subject: [PATCH] freshBootstrapTools: remove rec in favor of explicit attrset
 building

---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index b8189ccf2456..49ea90cda7bd 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -27,14 +27,11 @@ let
       { };
 
   pkgs = import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap);
-in
 
-rec {
   build = pkgs.callPackage ./stdenv-bootstrap-tools.nix { };
-  inherit (build) bootstrapFiles;
 
   bootstrapTools = pkgs.callPackage ./bootstrap-tools.nix {
-    inherit (bootstrapFiles) bootstrapTools unpack;
+    inherit (build.bootstrapFiles) bootstrapTools unpack;
   };
 
   test = pkgs.callPackage ./test-bootstrap-tools.nix { inherit bootstrapTools; };
@@ -50,9 +47,19 @@ rec {
       args:
       let
         args' = args // {
-          inherit bootstrapFiles;
+          inherit (build) bootstrapFiles;
         };
       in
       (import (test-pkgspath + "/pkgs/stdenv/darwin") args');
   };
+in
+{
+  inherit
+    build
+    bootstrapTools
+    test
+    test-pkgs
+    ;
+
+  inherit (build) bootstrapFiles;
 }