diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-14 19:07:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-14 19:07:46 -0400 |
| commit | 19fc061a1363d54bcab0e11e9187f46425b5f763 (patch) | |
| tree | b3d7c2b6125118e0653e6884ff0136d2277e6881 | |
| parent | 5568c7c04b70f388bbcd412abc6f6e39ff1821c1 (diff) | |
| parent | f8790e0156dae0c04f922a172bfb9d9a7266c172 (diff) | |
Merge pull request #43169 from samueldr/fix/stripDirs
Fixes `stripDirs` use after signature change
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/10.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 6756f68cdf722..b6a7081b896cc 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -164,7 +164,7 @@ let # Strip binaries further than normal. 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. find $out/bin $out/lib -type f | while read i; do diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index 2c76d59512b67..7ed493fe92e96 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -142,7 +142,7 @@ let # FIXME: this is unnecessary once the multiple-outputs branch is merged. preFixup = '' - prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" + prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}" patchELF $jre propagatedBuildInputs+=" $jre" diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 57771e383279b..5b31bc18b8c2a 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -206,7 +206,7 @@ let # FIXME: this is unnecessary once the multiple-outputs branch is merged. preFixup = '' - prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" + prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}" patchELF $jre propagatedBuildInputs+=" $jre" |