diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix index 12d9448595e..22b5be7dc69 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen , pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib -, ffmpeg, python, ruby }: +, ffmpeg_3, python, ruby }: let major = "14"; @@ -21,7 +21,7 @@ let sha256 = "16aj15xksc266gv3y42m0g277pfvp71901lrngndcnpr7i2zshnr"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; dontUseCmakeConfigure = true; @@ -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 ''; |