From 8861008db8474e9dc87dee3caaa259f28a19364a Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 5 Oct 2024 14:19:21 +0100 Subject: [PATCH] blender: add Arch patches for FFmpeg 7 (#346239) --- pkgs/applications/misc/blender/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index a2ac2a81c8b6..1a9ea4fd5ea4 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -19,6 +19,7 @@ dbus, embree, fetchgit, + fetchpatch2, fetchzip, ffmpeg, fftw, @@ -132,7 +133,17 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "source"; - patches = [ ./draco.patch ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; + patches = [ + ./draco.patch + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/raw/4b6214600e11851d7793256e2f6846a594e6f223/ffmpeg-7-1.patch"; + hash = "sha256-YXXqP/+79y3f41n3cJ3A1RBzgdoYqfKZD/REqmWYdgQ="; + }) + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/raw/4b6214600e11851d7793256e2f6846a594e6f223/ffmpeg-7-2.patch"; + hash = "sha256-mF6IA/dbHdNEkBN5XXCRcLIZ/8kXoirNwq7RDuLRAjw="; + }) + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; postPatch = (lib.optionalString stdenv.hostPlatform.isDarwin ''