diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bison/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/bison/default.nix index a2ea6fb5cf81..80b488a800dd 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/bison/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/bison/default.nix @@ -77,5 +77,5 @@ bash.runCommand "${pname}-${version}" make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bzip2/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/bzip2/static.nix index a597724c871a..fcdb8131957e 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/bzip2/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/bzip2/static.nix @@ -5,6 +5,7 @@ gcc, musl, binutils, + findutils, gnumake, gnutar, gzip, @@ -26,6 +27,7 @@ bash.runCommand "${pname}-${version}" gcc musl binutils + findutils gnumake gnutar gzip @@ -60,4 +62,8 @@ bash.runCommand "${pname}-${version}" # Install make install -j $NIX_BUILD_CORES PREFIX=$out + + # Strip + # Ignore failures, because strip may fail on non-elf files. + find $out/{bin,lib} -type f -exec strip --strip-debug {} + || true '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/coreutils/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/static.nix index a9884b3fb5e8..680d954cc337 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/coreutils/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/static.nix @@ -76,5 +76,5 @@ bash.runCommand "${pname}-${version}" make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/diffutils/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/diffutils/static.nix index 625819146a74..063d1f0a4100 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/diffutils/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/diffutils/static.nix @@ -77,5 +77,5 @@ bash.runCommand "${pname}-${version}" make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/findutils/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/findutils/static.nix index 1b15ab1f1b58..aa68c36eb73b 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/findutils/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/findutils/static.nix @@ -76,6 +76,6 @@ bash.runCommand "${pname}-${version}" make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip rm $out/bin/updatedb '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gawk/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/gawk/static.nix index e6b20ad4d5e6..2abe73c2aa0c 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gawk/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gawk/static.nix @@ -69,6 +69,6 @@ bash.runCommand "${pname}-${version}" make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip rm $out/bin/gawkbug '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnugrep/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnugrep/static.nix index cfdd01efed61..69f8dadd22ab 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gnugrep/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnugrep/static.nix @@ -77,6 +77,6 @@ bash.runCommand "${pname}-${version}" make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip rm $out/bin/{egrep,fgrep} '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/static.nix index a1f762aa2e24..1a7da3f1aff3 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/static.nix @@ -86,5 +86,5 @@ bash.runCommand "${pname}-${version}" make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/static.nix index 7326f3189b05..7cf5c0d1e786 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/static.nix @@ -77,5 +77,5 @@ bash.runCommand "${pname}-${version}" make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnused/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnused/static.nix index d8d84c355590..f086c21747ff 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gnused/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnused/static.nix @@ -69,5 +69,5 @@ bash.runCommand "${pname}-${version}" make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnutar/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnutar/static.nix index 7e2655e8032a..3add87dc6f3a 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gnutar/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnutar/static.nix @@ -69,5 +69,5 @@ bash.runCommand "${pname}-${version}" make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gzip/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/gzip/static.nix index 82e161329f40..5697ce229934 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gzip/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gzip/static.nix @@ -76,5 +76,5 @@ bash.runCommand "${pname}-${version}" make -j $NIX_BUILD_CORES bin_SCRIPTS= # Install - make -j $NIX_BUILD_CORES bin_SCRIPTS= install + make -j $NIX_BUILD_CORES bin_SCRIPTS= install-strip '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/musl/static.nix index 452a4256f483..2376db89984e 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/musl/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/static.nix @@ -6,6 +6,7 @@ bash, gcc, binutils, + findutils, gnumake, gnugrep, gnused, @@ -29,6 +30,7 @@ bash.runCommand "${pname}-${version}" nativeBuildInputs = [ gcc binutils + findutils gnumake gnused gnugrep @@ -90,4 +92,8 @@ bash.runCommand "${pname}-${version}" sed -i 's|/bin/sh|${lib.getExe bash}|' $out/bin/* ln -s ../lib/libc.so $out/bin/ldd ln -s $(ls -d ${linux-headers}/include/* | grep -v scsi\$) $out/include/ + + # Strip + # Ignore failures, because strip may fail on non-elf files. + find $out/{bin,lib} -type f -exec strip --strip-debug {} + || true '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix index 459722161829..d1655151722e 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix @@ -77,11 +77,12 @@ bash.runCommand "${pname}-${version}" --disable-silent-rules \ --disable-nls \ --disable-shared \ + --disable-scripts \ --disable-assembler # Build make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip ''