public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114549 from taku0/fix_114495

Browse Source 
adoptopenjdk-bin, zulu, graalvm11-ce: do not wrap jspawnhelper
This commit is contained in:
Silvan Mosberger 2021-02-27 16:05:18 +01:00 committed by GitHub
commit 9e731ddb49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
View File

@ -82,7 +82,10 @@ let result = stdenv.mkDerivation rec {
EOF EOF
# We cannot use -exec since wrapProgram is a function but not a command. # We cannot use -exec since wrapProgram is a function but not a command.
for bin in $( find "$out" -executable -type f ); do #
# jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it
# breaks building OpenJDK (#114495).
for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
if patchelf --print-interpreter "$bin" &> /dev/null; then if patchelf --print-interpreter "$bin" &> /dev/null; then
wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
fi fi

5
pkgs/development/compilers/graalvm/community-edition.nix
View File

@ -189,7 +189,10 @@ let
preFixup = '' preFixup = ''
# We cannot use -exec since wrapProgram is a function but not a # We cannot use -exec since wrapProgram is a function but not a
# command. # command.
for bin in $( find "$out" -executable -type f -not -path '*/languages/ruby/lib/gems/*' ); do #
# jspawnhelper is executed from JVM, so it doesn't need to wrap it,
# and it breaks building OpenJDK (#114495).
for bin in $( find "$out" -executable -type f -not -path '*/languages/ruby/lib/gems/*' -not -name jspawnhelper ); do
if patchelf --print-interpreter "$bin" &> /dev/null || head -n 1 "$bin" | grep '^#!' -q; then if patchelf --print-interpreter "$bin" &> /dev/null || head -n 1 "$bin" | grep '^#!' -q; then
wrapProgram "$bin" \ wrapProgram "$bin" \
--prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"

5
pkgs/development/compilers/zulu/default.nix
View File

@ -81,7 +81,10 @@ in stdenv.mkDerivation {
EOF EOF
'' + lib.optionalString stdenv.isLinux '' '' + lib.optionalString stdenv.isLinux ''
# We cannot use -exec since wrapProgram is a function but not a command. # We cannot use -exec since wrapProgram is a function but not a command.
for bin in $( find "$out" -executable -type f ); do #
# jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it
# breaks building OpenJDK (#114495).
for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
done done
''; '';