mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-17 01:24:47 +00:00
freshBootstrapTools: nixfmt make-bootstrap-tools.nix
This commit is contained in:
parent
d0d5a7a112
commit
91e1f1c9d6
@ -9,16 +9,22 @@
|
||||
}:
|
||||
|
||||
let
|
||||
cross = if crossSystem != null
|
||||
then { inherit crossSystem; }
|
||||
else {};
|
||||
cross = if crossSystem != null then { inherit crossSystem; } else { };
|
||||
|
||||
custom-bootstrap = if bootstrapFiles != null
|
||||
then { stdenvStages = args:
|
||||
let args' = args // { bootstrapFiles = bootstrapFiles; };
|
||||
in (import "${pkgspath}/pkgs/stdenv/darwin" args');
|
||||
}
|
||||
else {};
|
||||
custom-bootstrap =
|
||||
if bootstrapFiles != null then
|
||||
{
|
||||
stdenvStages =
|
||||
args:
|
||||
let
|
||||
args' = args // {
|
||||
bootstrapFiles = bootstrapFiles;
|
||||
};
|
||||
in
|
||||
(import "${pkgspath}/pkgs/stdenv/darwin" args');
|
||||
}
|
||||
else
|
||||
{ };
|
||||
|
||||
pkgs = import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap);
|
||||
in
|
||||
@ -40,8 +46,13 @@ rec {
|
||||
# that platform.
|
||||
localSystem = if crossSystem != null then crossSystem else localSystem;
|
||||
|
||||
stdenvStages = args: let
|
||||
args' = args // { inherit bootstrapFiles; };
|
||||
in (import (test-pkgspath + "/pkgs/stdenv/darwin") args');
|
||||
stdenvStages =
|
||||
args:
|
||||
let
|
||||
args' = args // {
|
||||
inherit bootstrapFiles;
|
||||
};
|
||||
in
|
||||
(import (test-pkgspath + "/pkgs/stdenv/darwin") args');
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user