Merge staging-next into staging

2021-05-04 18:21:27 +00:00
parent dfafc173e0 0ef4d5f1f6
commit 4cbb35eba8
37 changed files with 4129 additions and 5137 deletions
--- a/pkgs/development/compilers/openjdk/openjfx/15.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/15.nix
@@ -95,8 +95,9 @@ in makePackage {

  postFixup = ''
    # Remove references to bootstrap.
+    export openjdkOutPath='${openjdk11_headless.outPath}'
    find "$out" -name \*.so | while read lib; do
-      new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${lib.escape ["+"] openjdk11_headless.outPath}[^:]*,,')"
+      new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
      patchelf --set-rpath "$new_refs" "$lib"
    done
  '';