gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freshBootstrapTools: remove rec in favor of explicit attrset building

Browse Source
This commit is contained in:
Philip Taron
2024-07-27 10:48:42 -07:00
committed by Florian Brandes
parent 195284f049
commit c6e8939a5d
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View File

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