diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix index d6beab13bd0a..4100158669c9 100644 --- a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix +++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix @@ -1,12 +1,11 @@ { ffmpeg_7-full, fetchFromGitHub, - fetchpatch2, lib, }: let - version = "7.1.2-2"; + version = "7.1.4-1"; in (ffmpeg_7-full.override { @@ -14,8 +13,8 @@ in source = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; - rev = "v${version}"; - hash = "sha256-0dUQ/3843wWpb10XZl3ddCbjjbFGWh3eoNH4EuWSQiQ="; + tag = "v${version}"; + hash = "sha256-VijSSbtcaeQNf1UwpPKTIfzAHHp2BHvBdhXeigTQEbI="; }; }).overrideAttrs (old: { @@ -26,15 +25,6 @@ in "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067 ]; - # Clobber upstream patches as they don't apply to the Jellyfin fork - patches = [ - (fetchpatch2 { - name = "lcevcdec-4.0.0-compat.patch"; - url = "https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/fa23202cc7baab899894e8d22d82851a84967848.patch"; - hash = "sha256-Ixkf1xzuDGk5t8J/apXKtghY0X9cfqSj/q987zrUuLQ="; - }) - ]; - postPatch = '' for file in $(cat debian/patches/series); do patch -p1 < debian/patches/$file