diff options
| author | John Ericson <git@JohnEricson.me> | 2023-05-22 12:12:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-22 12:12:09 -0400 |
| commit | f704248a9a83c9d76ba9d097974b389bb8368ba1 (patch) | |
| tree | f9ba2571e6975823da5f68ac943b82c4dc25d8d6 | |
| parent | f3ff55097e6b92e155a27a7a96f1ef264118f1e0 (diff) | |
| parent | d402a52e2680d731656cfa412abbd6fc39d92385 (diff) | |
Merge pull request #233408 from emilytrau/remove-lnboot
minimal-bootstrap.tinycc-mes: remove unused ln-boot dependency
3 files changed, 2 insertions, 4 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 85f998198aa73..c24504ec00a02 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 c8dde76a93648..b7a681f8270cf 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); } diff --git a/pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix index d05ac35a6d992..68fa84fd7ad1a 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 |