nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues 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
parent 91e1f1c9d6
commit 1441f48d99
No known key found for this signature in database
1 changed files with 12 additions and 5 deletions
Show Stats 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);
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;
}