From 8239e01b7a1a114f63f70617da72e3acb6547121 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Mon, 22 May 2023 22:57:57 +1000 Subject: [PATCH 1/2] minimal-bootstrap.tinycc-mes: remove unused ln-boot dependency --- pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix index d05ac35a6d9..68fa84fd7ad 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix @@ -1,7 +1,6 @@ { lib , kaem , mes-libc -, ln-boot }: rec { @@ -57,7 +56,6 @@ rec { (["-c" "-D" "TCC_TARGET_I386=1" ] ++ libtccBuildOptions); compiler = kaem.runCommand "${pname}-${version}" { inherit pname version meta; - nativeBuildInputs = [ ln-boot ]; passthru.tests = rec { get-version = result: kaem.runCommand "${pname}-get-version-${version}" {} '' ${result}/bin/tcc -version From d402a52e2680d731656cfa412abbd6fc39d92385 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Mon, 22 May 2023 23:01:48 +1000 Subject: [PATCH 2/2] minimal-bootstrap.ln-boot: fix typo in usage --- pkgs/os-specific/linux/minimal-bootstrap/ln-boot/default.nix | 2 +- pkgs/os-specific/linux/minimal-bootstrap/ln-boot/ln.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/ln-boot/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/ln-boot/default.nix index 85f998198aa..c24504ec00a 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/ln-boot/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/ln-boot/default.nix @@ -4,7 +4,7 @@ }: let pname = "ln-boot"; - version = "unstable-2023-05-01"; + version = "unstable-2023-05-22"; src = ./ln.c; in diff --git a/pkgs/os-specific/linux/minimal-bootstrap/ln-boot/ln.c b/pkgs/os-specific/linux/minimal-bootstrap/ln-boot/ln.c index c8dde76a936..b7a681f8270 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/ln-boot/ln.c +++ b/pkgs/os-specific/linux/minimal-bootstrap/ln-boot/ln.c @@ -8,7 +8,7 @@ int main(int argc, char** argv) if (argc != 4 || strcmp(argv[1], "-s")) { fputs("Usage: ", stdout); fputs(argv[0], stdout); - fputs("ln -s TARGET LINK_NAME\n", stdout); + fputs(" -s TARGET LINK_NAME\n", stdout); exit(EXIT_FAILURE); }