From a486fcd75047c54ca2ebeb64210010cf91cb3dee Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Aug 2025 08:05:26 +0300 Subject: [PATCH] kdePackages.akonadi: backport patch recommended by upstream --- pkgs/kde/gear/akonadi/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/kde/gear/akonadi/default.nix b/pkgs/kde/gear/akonadi/default.nix index 1b84ee1212f0..8e4023cc5ff6 100644 --- a/pkgs/kde/gear/akonadi/default.nix +++ b/pkgs/kde/gear/akonadi/default.nix @@ -1,6 +1,7 @@ { lib, mkKdeDerivation, + fetchpatch, qttools, accounts-qt, kaccounts-integration, @@ -24,6 +25,13 @@ mkKdeDerivation { patches = [ # Always regenerate MySQL config, as the store paths don't have accurate timestamps ./ignore-mysql-config-timestamp.patch + + # Backport fix for Merkuro account settings not opening + # FIXME: remove in next update + (fetchpatch { + url = "https://invent.kde.org/pim/akonadi/-/commit/8a2dfd13b3c4730636a962121368d49c57f79273.patch"; + hash = "sha256-r3jQUxbKvZbpKWg6SUQTyFpos7aLC5cNoByl22vpaR8="; + }) ]; extraCmakeFlags = [