mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-02 10:14:09 +00:00
openjfx: build openjfx21 with openjdk21
This commit is contained in:
parent
936fd7cb3b
commit
bc1d332e1e
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless
|
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless
|
||||||
, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
|
, openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
|
||||||
, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand
|
, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand
|
||||||
, withMedia ? true
|
, withMedia ? true
|
||||||
, withWebKit ? false
|
, withWebKit ? false
|
||||||
@ -49,7 +49,7 @@ let
|
|||||||
|
|
||||||
config = writeText "gradle.properties" (''
|
config = writeText "gradle.properties" (''
|
||||||
CONF = Release
|
CONF = Release
|
||||||
JDK_HOME = ${openjdk19_headless.home}
|
JDK_HOME = ${openjdk21_headless.home}
|
||||||
'' + args.gradleProperties or "");
|
'' + args.gradleProperties or "");
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
@ -111,14 +111,14 @@ in makePackage {
|
|||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
# Remove references to bootstrap.
|
# Remove references to bootstrap.
|
||||||
export openjdkOutPath='${openjdk19_headless.outPath}'
|
export openjdkOutPath='${openjdk21_headless.outPath}'
|
||||||
find "$out" -name \*.so | while read lib; do
|
find "$out" -name \*.so | while read lib; do
|
||||||
new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
|
new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
|
||||||
patchelf --set-rpath "$new_refs" "$lib"
|
patchelf --set-rpath "$new_refs" "$lib"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
disallowedReferences = [ openjdk17_headless openjdk19_headless ];
|
disallowedReferences = [ openjdk17_headless openjdk21_headless ];
|
||||||
|
|
||||||
passthru.deps = deps;
|
passthru.deps = deps;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user