1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00

Merge pull request #262410 from artemist/minimal-bootstrap-flake

minimal-bootstrap: fix build in flakes
This commit is contained in:
Emily Trau 2023-10-21 10:50:35 +11:00 committed by GitHub
commit 28eb936285
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions

View file

@ -1,4 +1,4 @@
{
{ hostPlatform
}:
rec {
@ -65,7 +65,7 @@ rec {
*/
minimal-bootstrap-sources = derivation {
inherit name;
system = builtins.currentSystem;
system = hostPlatform.system;
outputHashMode = "recursive";
inherit outputHashAlgo outputHash;

View file

@ -12,12 +12,13 @@
#
{ lib
, hostPlatform
, fetchFromGitHub
, fetchpatch
}:
let
expected = import ./bootstrap-sources.nix { };
expected = import ./bootstrap-sources.nix { inherit hostPlatform; };
in
fetchFromGitHub {

View file

@ -28322,7 +28322,9 @@ with pkgs;
checkMeta = callPackage ../stdenv/generic/check-meta.nix { };
});
minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix { };
make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { };
make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix {
inherit (stdenv) hostPlatform;
};
mingetty = callPackage ../os-specific/linux/mingetty { };