Unverified Commit 1de41f9f authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #231309 from emilytrau/minimal-bootstrap-runcommand 

minimal-bootstrap.kaem: move runCommand into kaem
parents 8360969c aa0a36bc

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

+1 −1
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ lib.makeScope 
    tinycc-bootstrappable = callPackage ./tinycc/bootstrappable.nix { };

    tinycc-mes = callPackage ./tinycc/mes.nix { };



    inherit (callPackage ./utils.nix { }) fetchurl derivationWithMeta writeTextFile writeText runCommand;

    inherit (callPackage ./utils.nix { }) fetchurl derivationWithMeta writeTextFile writeText;



  })

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

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

, runCommand

, fetchurl

, kaem

, tinycc

, gnupatch

}:
@@ -145,7 +145,7 @@ let 


  objects = map (x: lib.replaceStrings [".c"] [".o"] (builtins.baseNameOf x)) sources;

in

runCommand "${pname}-${version}" {

kaem.runCommand "${pname}-${version}" {

  inherit pname version;



  nativeBuildInputs = [ tinycc gnupatch ];

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

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

, runCommand

, fetchurl

, kaem

, tinycc

}:

let
@@ -67,7 +67,7 @@ let 


  objects = map (x: lib.replaceStrings [".c"] [".o"] (builtins.baseNameOf x)) sources;

in

runCommand "${pname}-${version}" {

kaem.runCommand "${pname}-${version}" {

  inherit pname version;



  nativeBuildInputs = [ tinycc ];

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

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

, runCommand

, kaem

, mes

}:

let
@@ -8,7 +8,7 @@ let 


  src = ./ln.c;

in

runCommand "${pname}-${version}" {

kaem.runCommand "${pname}-${version}" {

  inherit pname version;



  meta = with lib; {

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

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

, runCommand

, fetchurl

, writeText

, callPackage

, kaem

, m2libc

, mescc-tools

}:
@@ -43,7 +43,7 @@ let 
  sourceArchive = out: sources:

    "catm ${out} ${lib.concatMapStringsSep " " (replaceExt ".s") sources}";

in

runCommand "${pname}-${version}" {

kaem.runCommand "${pname}-${version}" {

  inherit pname version;



  passthru = { inherit src nyacc; };