Fixes stripDirs
use after signature change
#43169
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Since a1cdc20,
stripDirs
now takes an addition prefixed parameters, the strip command to run.It turns out, there were two additional users of
stripDirs
inside the whole of<nixpkgs>
, they areopenjdk
andstage-1.nix
. The way the command was changed made it so that the stripping wasn't done anymore.This adds
$STRIP
as the first parameter tostripDirs
, which I believe makes it equivalent to its older behaviour.Testing done
mobile-nixos
, which has the samestage-1
steps changed here, aboot.img
was reduced from 17M to 9M.nixos/tests/boot-stage1.nix
jar
fromopenjdk8
runs... (don't have more extensive tests I know of)openjdk10
nix-path-info -S
Before:nix-path-info -S
After:Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)stripDirs