From 4dfc641c2f060360678df693d603779edfb722be Mon Sep 17 00:00:00 2001 From: ProxyVT Date: Tue, 7 Apr 2026 13:18:33 +0300 Subject: [PATCH] ffmpeg: limit patch application to versions < 8.1 This fixes building with unbreak-hardcoded-tables.patch, which is only required for ffmpeg versions between 5.1 and 8.0. --- pkgs/development/libraries/ffmpeg/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 6310aff338aa..0b9142ed67a9 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -452,6 +452,8 @@ stdenv.mkDerivation ( ] ++ optionals (lib.versionAtLeast version "5.1") [ ./nvccflags-cpp14.patch + ] + ++ optionals (lib.versionAtLeast version "5.1" && lib.versionOlder version "8.1") [ (fetchpatch2 { name = "unbreak-hardcoded-tables.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/1d47ae65bf6df91246cbe25c997b25947f7a4d1d";