From 41ecde38fa43f1f5864a3cc2348a5f744af05041 Mon Sep 17 00:00:00 2001 From: ProxyVT Date: Wed, 18 Mar 2026 11:13:30 +0300 Subject: [PATCH 1/2] ffmpeg_8: 8.0.1 -> 8.1 Diff: https://github.com/FFmpeg/FFmpeg/compare/n8.0.1...n8.1 --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 0e82e63014c1..cd003aecd13e 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -30,8 +30,8 @@ let hash = "sha256-1w4OSlz88D2pnZVXQcI4uyX+triNK0NXzlsyt7GGSLU="; }; v8 = { - version = "8.0.1"; - hash = "sha256-eA5fP/uZqF5+jDDt4tHArGqyt7zbrLZ21v+Lchr8OS8="; + version = "8.1"; + hash = "sha256-FdKhhCveEo5UodEoyUh3aBHABv3OT2VXmwBXE1ce3p0="; }; in From 4dfc641c2f060360678df693d603779edfb722be Mon Sep 17 00:00:00 2001 From: ProxyVT Date: Tue, 7 Apr 2026 13:18:33 +0300 Subject: [PATCH 2/2] 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";