From bc8cde207e71a62005b5ad0c560d3fe9b5d62e66 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 21 Jul 2024 13:58:10 +0100 Subject: [PATCH] guacamole-server: add upstream patch for FFmpeg 7 --- pkgs/servers/guacamole-server/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/guacamole-server/default.nix b/pkgs/servers/guacamole-server/default.nix index 1b9623eab22f..0a6fa5dd89a2 100644 --- a/pkgs/servers/guacamole-server/default.nix +++ b/pkgs/servers/guacamole-server/default.nix @@ -1,11 +1,12 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , pkg-config , autoPatchelfHook , autoreconfHook , cairo -, ffmpeg_4-headless +, ffmpeg_7-headless , freerdp , libjpeg_turbo , libpng @@ -35,6 +36,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZrUaoWkZ3I/LxE7csDXXeUZ92jZDhkZ1c8EQU0gI1yY="; }; + patches = [ + # GUACAMOLE-1952: Add compatibility with FFMPEG 7.0 + (fetchpatch2 { + url = "https://github.com/apache/guacamole-server/commit/cc8addf9beb90305037a32f9f861a893be4cae08.patch?full_index=1"; + hash = "sha256-VCr2/8lQHKVdsdah9gvak4MjFHO+X4ixE5+zsvwIY1I="; + }) + ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=format-overflow" @@ -52,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo - ffmpeg_4-headless + ffmpeg_7-headless freerdp libjpeg_turbo libossp_uuid