Skip to content

Commit

Permalink
openjfx12: correctly remove references to jdk11 (#96298)
Browse files Browse the repository at this point in the history
The new version string for jdk11 contains a '+' character, which needs
to be escaped for use in the sed command.
Fixes #95117.

(cherry picked from commit 5622b6b)
  • Loading branch information
Milan authored and Ericson2314 committed Jun 15, 2021
1 parent 1db42b7 commit 246b75a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/openjfx/12.nix
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,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
'';
Expand Down

0 comments on commit 246b75a

Please sign in to comment.