ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43169 from samueldr/fix/stripDirs

Browse Source 
Fixes `stripDirs` use after signature change
This commit is contained in:
Matthew Bauer 2018-07-14 19:07:46 -04:00 committed by GitHub
commit 19fc061a13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/system/boot/stage-1.nix
View File

@ -164,7 +164,7 @@ let
# Strip binaries further than normal. # Strip binaries further than normal.
chmod -R u+w $out chmod -R u+w $out
stripDirs "lib bin" "-s" stripDirs "$STRIP" "lib bin" "-s"
# Run patchelf to make the programs refer to the copied libraries. # Run patchelf to make the programs refer to the copied libraries.
find $out/bin $out/lib -type f | while read i; do find $out/bin $out/lib -type f | while read i; do

2
pkgs/development/compilers/openjdk/10.nix
View File

@ -142,7 +142,7 @@ let
# FIXME: this is unnecessary once the multiple-outputs branch is merged. # FIXME: this is unnecessary once the multiple-outputs branch is merged.
preFixup = '' preFixup = ''
prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}"
patchELF $jre patchELF $jre
propagatedBuildInputs+=" $jre" propagatedBuildInputs+=" $jre"

2
pkgs/development/compilers/openjdk/8.nix
View File

@ -206,7 +206,7 @@ let
# FIXME: this is unnecessary once the multiple-outputs branch is merged. # FIXME: this is unnecessary once the multiple-outputs branch is merged.
preFixup = '' preFixup = ''
prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}"
patchELF $jre patchELF $jre
propagatedBuildInputs+=" $jre" propagatedBuildInputs+=" $jre"