From 3ae7b3cd4541f7b2246af01ecc8613f07a1d2ba5 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 3 Oct 2024 21:54:00 +0100 Subject: [PATCH] openmw: pin FFmpeg 6 Upstream is ready for FFmpeg 7 in the development version, but there are too many patches to reasonably apply to the release version. --- pkgs/games/openmw/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 22bd90a348a9..59c5295b1b31 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitLab , fetchpatch +, fetchpatch2 , cmake , pkg-config , wrapQtAppsHook @@ -11,7 +12,8 @@ , VideoDecodeAcceleration , boost , bullet -, ffmpeg +# Please unpin this on the next OpenMW release. +, ffmpeg_6 , libXt , luajit , lz4 @@ -80,7 +82,7 @@ stdenv.mkDerivation rec { SDL2 boost bullet' - ffmpeg + ffmpeg_6 libXt luajit lz4