Unverified Commit 28eb9362 authored by Emily Trau's avatar Emily Trau Committed by GitHub
Browse files

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

minimal-bootstrap: fix build in flakes
parents 7cd0bd5c 76d0d657

pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix

+2 −2
Original line number Diff line number Diff line 
{

{ hostPlatform

}:



rec {
@@ -65,7 +65,7 @@ rec { 
  */

  minimal-bootstrap-sources = derivation {

    inherit name;

    system = builtins.currentSystem;

    system = hostPlatform.system;

    outputHashMode = "recursive";

    inherit outputHashAlgo outputHash;

pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix

+2 −1
Original line number Diff line number Diff line
@@ -12,12 +12,13 @@ 
#



{ lib

, hostPlatform

, fetchFromGitHub

, fetchpatch

}:



let

  expected = import ./bootstrap-sources.nix { };

  expected = import ./bootstrap-sources.nix { inherit hostPlatform; };

in



fetchFromGitHub {

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };