summary refs log tree commit diff
path: root/nixos/modules/system/boot/stage-1.nix
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-08-07 11:04:45 +0100
committerSergei Trofimovich <slyich@gmail.com>2022-08-07 11:05:29 +0100
commitfb324910bfb9bc9e870ee8341d88bb6449b3eb27 (patch)
tree9d5ae433ffa3be8a370bda01a58ed5d6e2856bae /nixos/modules/system/boot/stage-1.nix
parent9d3f3bc3dc80a7c7ddf0ce29752e0320b6d0b260 (diff)
downloadnixpkgs-fb324910bfb9bc9e870ee8341d88bb6449b3eb27.tar
nixpkgs-fb324910bfb9bc9e870ee8341d88bb6449b3eb27.tar.gz
nixpkgs-fb324910bfb9bc9e870ee8341d88bb6449b3eb27.tar.bz2
nixpkgs-fb324910bfb9bc9e870ee8341d88bb6449b3eb27.tar.lz
nixpkgs-fb324910bfb9bc9e870ee8341d88bb6449b3eb27.tar.xz
nixpkgs-fb324910bfb9bc9e870ee8341d88bb6449b3eb27.tar.zst
nixpkgs-fb324910bfb9bc9e870ee8341d88bb6449b3eb27.zip
nixos/stage-1: srestore striping of bin/ and lib/
commit 05077250615fa33 ("setup-hooks/strip.sh: run RANLIB on static
archives after stripping") added an extra argument to `stripDirs()`
helper.

I did not realize it's used outside the strip hook itself. Restore
stripping by passing $RANLIB as a new argument.
Diffstat (limited to 'nixos/modules/system/boot/stage-1.nix')
-rw-r--r--nixos/modules/system/boot/stage-1.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index ec2f3d18c68..37adcc531d3 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -219,7 +219,7 @@ let
 
       # Strip binaries further than normal.
       chmod -R u+w $out
-      stripDirs "$STRIP" "lib bin" "-s"
+      stripDirs "$STRIP" "$RANLIB" "lib bin" "-s"
 
       # Run patchelf to make the programs refer to the copied libraries.
       find $out/bin $out/lib -type f | while read i; do