From 0b302980c0d1cc56507313e33567773f61ff0434 Mon Sep 17 00:00:00 2001 From: DavHau Date: Sat, 5 Apr 2025 23:25:27 +0700 Subject: [PATCH] ffmpeg: fix build for armv7 --- pkgs/development/libraries/ffmpeg/generic.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 83c324ab38a1..31fd9cace943 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -462,6 +462,13 @@ stdenv.mkDerivation ( hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y="; }) ] + ++ optionals (lib.versionOlder version "7" && stdenv.hostPlatform.isAarch32) [ + (fetchpatch2 { + name = "binutils-2-43-compat.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/654bd47716c4f36719fb0f3f7fd8386d5ed0b916"; + hash = "sha256-OLiQHKBNp2p63ZmzBBI4GEGz3WSSP+rMd8ITfZSVRgY="; + }) + ] ++ optionals (lib.versionAtLeast version "7.1" && lib.versionOlder version "7.1.1") [ ./fix-fate-ffmpeg-spec-disposition-7.1.patch ]