openjfx23: 23-ga -> 23.0.1+4

Drop a backported patch that was upstreamed.
This commit is contained in:
Emily 2024-10-24 19:43:24 +00:00
parent 2c50b625cf
commit f95c2f68da
2 changed files with 6 additions and 14 deletions

View File

@ -1,6 +1,6 @@
{
"hash": "sha256-a/ev91Rq7D3z9O56ZZQCgvvbfj5GBt5Lonow2NH3s/E=",
"hash": "sha256-H3BPLo7yKWBiiI8sd3wkLJDN9h6jbWj5119cs2YHLwU=",
"owner": "openjdk",
"repo": "jfx23u",
"rev": "23-ga"
"rev": "refs/tags/23.0.1+4"
}

View File

@ -69,17 +69,8 @@ stdenv.mkDerivation {
inherit (source) src;
patches =
if featureVersion == "23" then
[
# 8338701: Provide media support for libavcodec version 61
# <https://github.com/openjdk/jfx23u/pull/18>
(fetchpatch2 {
url = "https://github.com/openjdk/jfx23u/commit/aba60fda1c82f00e8e685107592305c403a31287.patch?full_index=1";
hash = "sha256-+aRhTwi4VQthAq1SH1jxPl0mTosNMKoTY52jm+jiKso=";
})
]
else if atLeast21 then
patches = lib.optionals (!atLeast23) (
if atLeast21 then
[
./21/patches/backport-ffmpeg-7-support-jfx21.patch
]
@ -87,7 +78,8 @@ stdenv.mkDerivation {
[
./17/patches/backport-ffmpeg-6-support-jfx11.patch
./17/patches/backport-ffmpeg-7-support-jfx11.patch
];
]
);
nativeBuildInputs = [
gradle_openjfx