minimal-bootstrap: move utils out of stage0-posix
This commit is contained in:
parent
1e88aa2594
commit
c5432d1f96
|
@ -10,11 +10,9 @@ lib.makeScope
|
|||
# declared here.
|
||||
(extra: lib.callPackageWith ({ inherit lib config buildPlatform hostPlatform; } // extra))
|
||||
(self: with self; {
|
||||
fetchurl = import ../../../build-support/fetchurl/boot.nix {
|
||||
inherit (buildPlatform) system;
|
||||
};
|
||||
inherit (callPackage ./utils.nix { }) fetchurl derivationWithMeta writeTextFile writeText runCommand;
|
||||
|
||||
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-libc = callPackage ./mes/libc.nix { };
|
||||
|
|
|
@ -17,6 +17,4 @@ lib.makeScope newScope (self: with self; {
|
|||
mescc-tools = callPackage ./mescc-tools { };
|
||||
|
||||
mescc-tools-extra = callPackage ./mescc-tools-extra { };
|
||||
|
||||
inherit (callPackage ./utils.nix { }) derivationWithMeta writeTextFile writeText runCommand;
|
||||
})
|
||||
|
|
|
@ -2,15 +2,18 @@
|
|||
, buildPlatform
|
||||
, callPackage
|
||||
, kaem
|
||||
, kaem-unwrapped
|
||||
, mescc-tools
|
||||
, mescc-tools-extra
|
||||
}:
|
||||
|
||||
let
|
||||
checkMeta = callPackage ../../../../stdenv/generic/check-meta.nix { };
|
||||
checkMeta = callPackage ../../../stdenv/generic/check-meta.nix { };
|
||||
in
|
||||
rec {
|
||||
fetchurl = import ../../../build-support/fetchurl/boot.nix {
|
||||
inherit (buildPlatform) system;
|
||||
};
|
||||
|
||||
derivationWithMeta = attrs:
|
||||
let
|
||||
passthru = attrs.passthru or {};
|
||||
|
@ -37,7 +40,7 @@ rec {
|
|||
inherit name text executable allowSubstitutes preferLocalBuild;
|
||||
passAsFile = [ "text" ];
|
||||
|
||||
builder = kaem-unwrapped;
|
||||
builder = "${kaem}/bin/kaem";
|
||||
args = [
|
||||
"--verbose"
|
||||
"--strict"
|
Loading…
Reference in a new issue