b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #233408 from emilytrau/remove-lnboot

Browse source 
minimal-bootstrap.tinycc-mes: remove unused ln-boot dependency
This commit is contained in:
John Ericson 2023-05-22 12:12:09 -04:00 committed by GitHub
parent f3ff55097e d402a52e26
commit f704248a9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
}: }:
let let
pname = "ln-boot"; pname = "ln-boot";
version = "unstable-2023-05-01"; version = "unstable-2023-05-22";
src = ./ln.c; src = ./ln.c;
in in

2
pkgs/os-specific/linux/minimal-bootstrap/ln-boot/ln.c
View file

@ -8,7 +8,7 @@ int main(int argc, char** argv)
if (argc != 4 || strcmp(argv[1], "-s")) { if (argc != 4 || strcmp(argv[1], "-s")) {
fputs("Usage: ", stdout); fputs("Usage: ", stdout);
fputs(argv[0], stdout); fputs(argv[0], stdout);
fputs("ln -s TARGET LINK_NAME\n", stdout); fputs(" -s TARGET LINK_NAME\n", stdout);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

2
pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix
View file

@ -1,7 +1,6 @@
{ lib { lib
, kaem , kaem
, mes-libc , mes-libc
, ln-boot
}: }:
rec { rec {
@ -57,7 +56,6 @@ rec {
(["-c" "-D" "TCC_TARGET_I386=1" ] ++ libtccBuildOptions); (["-c" "-D" "TCC_TARGET_I386=1" ] ++ libtccBuildOptions);
compiler = kaem.runCommand "${pname}-${version}" { compiler = kaem.runCommand "${pname}-${version}" {
inherit pname version meta; inherit pname version meta;
nativeBuildInputs = [ ln-boot ];
passthru.tests = rec { passthru.tests = rec {
get-version = result: kaem.runCommand "${pname}-get-version-${version}" {} '' get-version = result: kaem.runCommand "${pname}-get-version-${version}" {} ''
${result}/bin/tcc -version ${result}/bin/tcc -version