summary refs log tree commit diff
path: root/pkgs/development/compilers/zulu/default.nix
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2021-02-27 16:05:18 +0100
committerGitHub <noreply@github.com>2021-02-27 16:05:18 +0100
commit9e731ddb49d7536ef98c1f31b239a9cd76b5a8a7 (patch)
tree54904dfd76517008c06b5a8d0e8499ce412720cb /pkgs/development/compilers/zulu/default.nix
parent3f110f988bc567af01d56838b52d567b49603b91 (diff)
parent5ea6b9082242eb804def178aaf8408ac4ff6bcb3 (diff)
downloadnixpkgs-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/compilers/zulu/default.nix')
-rw-r--r--pkgs/development/compilers/zulu/default.nix5
1 files changed, 4 insertions, 1 deletions
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
   '';