From 5622b6b6feb669edc227aaf000413d5b593d4051 Mon Sep 17 00:00:00 2001 From: Milan Date: Wed, 26 Aug 2020 23:35:20 +0200 Subject: [PATCH] openjfx14: correctly remove references to jdk11 (#96298) The new version string for jdk11 contains a '+' character, which needs to be escaped for use in the sed command. Fixes #95117. --- pkgs/development/compilers/openjdk/openjfx/14.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/14.nix b/pkgs/development/compilers/openjdk/openjfx/14.nix index 04bb1fa5627..22b5be7dc69 100644 --- a/pkgs/development/compilers/openjdk/openjfx/14.nix +++ b/pkgs/development/compilers/openjdk/openjfx/14.nix @@ -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 '';