pyrox.dev / nixpkgs
lol
fork atom

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

minimal-bootstrap: fix build in flakes

authored by Emily Trau and committed by GitHub 28eb9362 7cd0bd5c

+7 -4
unified split
+2 -2
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
··· 1 - { 1 + { hostPlatform 2 2 }: 3 3 4 4 rec { ··· 65 65 */ 66 66 minimal-bootstrap-sources = derivation { 67 67 inherit name; 68 - system = builtins.currentSystem; 68 + system = hostPlatform.system; 69 69 outputHashMode = "recursive"; 70 70 inherit outputHashAlgo outputHash; 71 71
+2 -1
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix
··· 12 12 # 13 13 14 14 { lib 15 + , hostPlatform 15 16 , fetchFromGitHub 16 17 , fetchpatch 17 18 }: 18 19 19 20 let 20 - expected = import ./bootstrap-sources.nix { }; 21 + expected = import ./bootstrap-sources.nix { inherit hostPlatform; }; 21 22 in 22 23 23 24 fetchFromGitHub {
+3 -1
pkgs/top-level/all-packages.nix
··· 28322 28322 checkMeta = callPackage ../stdenv/generic/check-meta.nix { }; 28323 28323 }); 28324 28324 minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix { }; 28325 - make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { }; 28325 + make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { 28326 + inherit (stdenv) hostPlatform; 28327 + }; 28326 28328 28327 28329 mingetty = callPackage ../os-specific/linux/mingetty { }; 28328 28330