Commit c5432d1f authored by Emily Trau's avatar Emily Trau
Browse files

minimal-bootstrap: move utils out of stage0-posix

parent 1e88aa25

pkgs/os-specific/linux/minimal-bootstrap/default.nix

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

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

+0 −2
Original line number Diff line number Diff line
@@ -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;

})

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

+6 −3
Original line number Diff line number Diff line
@@ -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"