openjfx: build openjfx20 with openjdk20

This commit is contained in:
Infinidoge
2024-05-24 17:06:05 -04:00
parent 332f5d3de8
commit 936fd7cb3b
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless
, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
, openjdk20_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand
, withMedia ? true
, withWebKit ? false
@@ -49,7 +49,7 @@ let
config = writeText "gradle.properties" (''
CONF = Release
JDK_HOME = ${openjdk19_headless.home}
JDK_HOME = ${openjdk20_headless.home}
'' + args.gradleProperties or "");
buildPhase = ''
@@ -111,14 +111,14 @@ in makePackage {
postFixup = ''
# Remove references to bootstrap.
export openjdkOutPath='${openjdk19_headless.outPath}'
export openjdkOutPath='${openjdk20_headless.outPath}'
find "$out" -name \*.so | while read lib; do
new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
patchelf --set-rpath "$new_refs" "$lib"
done
'';
disallowedReferences = [ openjdk17_headless openjdk19_headless ];
disallowedReferences = [ openjdk17_headless openjdk20_headless ];
passthru.deps = deps;