Merge staging-next into staging

2020-08-27 08:37:03 +02:00
parent 25ac498482 52095e171f
commit 13d93aabfb
21 changed files with 6126 additions and 4047 deletions
@@ -96,7 +96,7 @@ in makePackage {
  postFixup = ''
    # Remove references to bootstrap.
    find "$out" -name \*.so | while read lib; do
-      new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11_headless}[^:]*,,')"
+      new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${lib.escape ["+"] openjdk11_headless.outPath}[^:]*,,')"
      patchelf --set-rpath "$new_refs" "$lib"
    done
  '';