diff options
author | Silvan Mosberger <contact@infinisil.com> | 2021-02-27 16:05:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-27 16:05:18 +0100 |
commit | 9e731ddb49d7536ef98c1f31b239a9cd76b5a8a7 (patch) | |
tree | 54904dfd76517008c06b5a8d0e8499ce412720cb /pkgs/development | |
parent | 3f110f988bc567af01d56838b52d567b49603b91 (diff) | |
parent | 5ea6b9082242eb804def178aaf8408ac4ff6bcb3 (diff) | |
download | nixpkgs-9e731ddb49d7536ef98c1f31b239a9cd76b5a8a7.tar nixpkgs-9e731ddb49d7536ef98c1f31b239a9cd76b5a8a7.tar.gz nixpkgs-9e731ddb49d7536ef98c1f31b239a9cd76b5a8a7.tar.bz2 nixpkgs-9e731ddb49d7536ef98c1f31b239a9cd76b5a8a7.tar.lz nixpkgs-9e731ddb49d7536ef98c1f31b239a9cd76b5a8a7.tar.xz nixpkgs-9e731ddb49d7536ef98c1f31b239a9cd76b5a8a7.tar.zst nixpkgs-9e731ddb49d7536ef98c1f31b239a9cd76b5a8a7.zip |
Merge pull request #114549 from taku0/fix_114495
adoptopenjdk-bin, zulu, graalvm11-ce: do not wrap jspawnhelper
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/graalvm/community-edition.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/zulu/default.nix | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 1c5fd67f2d9..ed8935b0042 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -82,7 +82,10 @@ let result = stdenv.mkDerivation rec { EOF # 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 wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" fi diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix index ea18be56250..3a8fca2c1a0 100644 --- a/pkgs/development/compilers/graalvm/community-edition.nix +++ b/pkgs/development/compilers/graalvm/community-edition.nix @@ -189,7 +189,10 @@ let preFixup = '' # We cannot use -exec since wrapProgram is a function but not a # 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 wrapProgram "$bin" \ --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 000530e66a7..c7b01877ad5 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -81,7 +81,10 @@ in stdenv.mkDerivation { EOF '' + lib.optionalString stdenv.isLinux '' # 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}" done ''; |