Merge pull request #313928 from wegank/openjdk-bump-split-5

openjdk21, openjfx21: update
This commit is contained in:
Weijia Wang 2024-06-01 22:28:14 +02:00 committed by GitHub
commit 4ed4611b0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions

View File

@ -14,8 +14,8 @@
let
version = {
feature = "21";
interim = "";
build = "35";
interim = ".0.3";
build = "9";
};
# when building a headless jdk, also bootstrap it with a headless jdk
@ -29,7 +29,7 @@ let
owner = "openjdk";
repo = "jdk${version.feature}u";
rev = "jdk-${version.feature}${version.interim}+${version.build}";
hash = "sha256-fA8nRWBuTL87S8mwapmNfCPPQoI2aKHjbHJ6PDN3khs=";
hash = "sha256-zRN16lrc5gtDlTVIQJRRx103w/VbRkatCLeEc9AXWPE=";
};
nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];

View File

@ -7,7 +7,7 @@
let
major = "21";
update = "";
update = ".0.3";
build = "-ga";
repover = "${major}${update}${build}";
gradle_ = (gradle_7.override {
@ -30,9 +30,9 @@ let
src = fetchFromGitHub {
owner = "openjdk";
repo = "jfx";
repo = "jfx21u";
rev = repover;
hash = "sha256-deNAGfnA6gwcAa64l0AWdkX+vJd3ZOfIgAifSl+/m+s=";
hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4=";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];