From 37d6aef521999114dd8e92dc147e39178b7257b8 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 5 Apr 2024 20:45:59 +0200 Subject: [PATCH] ffmpeg_7: add patch to fix checks https://trac.ffmpeg.org/ticket/10947#comment:1 --- pkgs/development/libraries/ffmpeg/generic.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 6ed7dfc7b757..2be86d5cb85a 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -405,6 +405,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e06ce6d2b45edac4a2df04f304e18d4727417d24"; hash = "sha256-73mlX1rdJrguw7OXaSItfHtI7gflDrFj+7SepVvvUIg="; } + ]) + ++ (lib.optionals (lib.versionAtLeast version "7.0") [ + { + # Will likely be obsolete in >7.0 + name = "fate_avoid_dependency_on_samples"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7b7b7819bd21cc92ac07f6696b0e7f26fa8f9834"; + hash = "sha256-TKI289XqtG86Sj9s7mVYvmkjAuRXeK+2cYYEDkg6u6I="; + } ])); configurePlatforms = [];