From 83d00f86663acc5d98ca56ca8e4659c1d3f88243 Mon Sep 17 00:00:00 2001 From: Emil Thorsoe Date: Fri, 25 Oct 2024 07:36:55 +0300 Subject: [PATCH] k3b: fix compile for ffmpeg_7 https://www.mail-archive.com/kde-bugs-dist@kde.org/msg914170.html --- pkgs/applications/kde/k3b.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index ba103101ab1a59..da6924ba0d1a17 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -35,6 +35,7 @@ sox, transcode, kinit, + fetchpatch, }: mkDerivation { @@ -47,6 +48,17 @@ mkDerivation { maintainers = with maintainers; [ sander ]; platforms = platforms.linux; }; + patches = [ + # compile fixes from upstream, remove when they stop applying + (fetchpatch { + url = "https://github.com/KDE/k3b/commit/712ef4adc992fd848dfd769f346f87216029c285.diff"; + sha256 = "sha256-wtLbd6WrytMrF4elPmR7auC7j+id0Ioom6TDQORkI/A="; + }) + (fetchpatch { + url = "https://github.com/KDE/k3b/commit/071535a79c3d2b074163cbb0881117a995ed17cd.diff"; + sha256 = "sha256-L7ZkIu8c/ns2KrvFD4icvUX5ibHcarPZxp3NRsvMowY="; + }) + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools