cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

minimal-bootstrap: move utils out of stage0-posix

Browse source
This commit is contained in:
Emily Trau 2023-05-03 15:29:31 +10:00
parent 1e88aa2594
commit c5432d1f96
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/os-specific/linux/minimal-bootstrap/default.nix
View file

@ -10,11 +10,9 @@ lib.makeScope
# declared here. # declared here.
(extra: lib.callPackageWith ({ inherit lib config buildPlatform hostPlatform; } // extra)) (extra: lib.callPackageWith ({ inherit lib config buildPlatform hostPlatform; } // extra))
(self: with self; { (self: with self; {
fetchurl = import ../../../build-support/fetchurl/boot.nix { inherit (callPackage ./utils.nix { }) fetchurl derivationWithMeta writeTextFile writeText runCommand;
inherit (buildPlatform) system;
};
inherit (callPackage ./stage0-posix { }) kaem m2libc mescc-tools mescc-tools-extra writeTextFile writeText runCommand; inherit (callPackage ./stage0-posix { }) kaem m2libc mescc-tools mescc-tools-extra;
mes = callPackage ./mes { }; mes = callPackage ./mes { };
mes-libc = callPackage ./mes/libc.nix { }; mes-libc = callPackage ./mes/libc.nix { };

2
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix
View file

@ -17,6 +17,4 @@ lib.makeScope newScope (self: with self; {
mescc-tools = callPackage ./mescc-tools { }; mescc-tools = callPackage ./mescc-tools { };
mescc-tools-extra = callPackage ./mescc-tools-extra { }; mescc-tools-extra = callPackage ./mescc-tools-extra { };
inherit (callPackage ./utils.nix { }) derivationWithMeta writeTextFile writeText runCommand;
}) })

9
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/utils.nix → pkgs/os-specific/linux/minimal-bootstrap/utils.nix
View file

@ -2,15 +2,18 @@
, buildPlatform , buildPlatform
, callPackage , callPackage
, kaem , kaem
, kaem-unwrapped
, mescc-tools , mescc-tools
, mescc-tools-extra , mescc-tools-extra
}: }:
let let
checkMeta = callPackage ../../../../stdenv/generic/check-meta.nix { }; checkMeta = callPackage ../../../stdenv/generic/check-meta.nix { };
in in
rec { rec {
fetchurl = import ../../../build-support/fetchurl/boot.nix {
inherit (buildPlatform) system;
};
derivationWithMeta = attrs: derivationWithMeta = attrs:
let let
passthru = attrs.passthru or {}; passthru = attrs.passthru or {};
@ -37,7 +40,7 @@ rec {
inherit name text executable allowSubstitutes preferLocalBuild; inherit name text executable allowSubstitutes preferLocalBuild;
passAsFile = [ "text" ]; passAsFile = [ "text" ];
builder = kaem-unwrapped; builder = "${kaem}/bin/kaem";
args = [ args = [
"--verbose" "--verbose"
"--strict" "--strict"