about summary refs log tree commit diff
path: root/pkgs/applications/kde
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2022-08-16 21:53:50 +0800
committerNick Cao <nickcao@nichi.co>2022-08-16 21:59:15 +0800
commitd5330dddc692b5313acaa8bbe676b86fd60117fc (patch)
treebc9eb2387b4118df82f599dbfd353099aa61f21c /pkgs/applications/kde
parent226ff16bd6fbe6d47e714379eeba8598cd61a90a (diff)
libsForQt5.messagelib: add patch for compatibility with cmake 3.24
Diffstat (limited to 'pkgs/applications/kde')
-rw-r--r--pkgs/applications/kde/messagelib.nix16
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix
index 3273716ca6736..193b9cadf53cc 100644
--- a/pkgs/applications/kde/messagelib.nix
+++ b/pkgs/applications/kde/messagelib.nix
@@ -1,12 +1,11 @@
 {
   mkDerivation, lib, kdepimTeam,
-  cmake_3_23,
   extra-cmake-modules, kdoctools,
   akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee,
   grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
   kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
   kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
-  pimcommon, qca-qt5, qtwebengine, syntax-highlighting
+  pimcommon, qca-qt5, qtwebengine, syntax-highlighting, fetchpatch
 }:
 
 mkDerivation {
@@ -15,7 +14,18 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = kdepimTeam;
   };
-  nativeBuildInputs = [ (extra-cmake-modules.override { cmake = cmake_3_23; }) kdoctools ];
+  patches = [
+    # fix compatibility with cmake 3.24
+    (fetchpatch {
+      url = "https://invent.kde.org/pim/messagelib/-/commit/6eaef36d42bdb05f3.patch";
+      hash = "sha256-H0ayU81HxX5moHOQ3hDW7tg824oqK1p9atrBhuvZ8K8=";
+    })
+    (fetchpatch {
+      url = "https://invent.kde.org/pim/messagelib/-/commit/3edc93673f94604c2.patch";
+      hash = "sha256-tBFWCfttjDjyQyWnKdhVfLY6QsixzqqYuvD77GVH080=";
+    })
+  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
     kconfig kconfigwidgets kiconthemes kio kjobwidgets kldap