From 4736025ec27c9ca22ad2422273911f2bd4db2ca0 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 26 Feb 2025 19:27:48 +0100
Subject: [PATCH] kaidan: 0.10.1 -> 0.11.0

---
 .../instant-messengers/kaidan/default.nix     | 24 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/pkgs/applications/networking/instant-messengers/kaidan/default.nix
index d0c19f23c0e7..319ab8a94626 100644
--- a/pkgs/applications/networking/instant-messengers/kaidan/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kaidan/default.nix
@@ -1,16 +1,18 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitLab,
   cmake,
   extra-cmake-modules,
   pkg-config,
-  qtquickcontrols2,
+  wrapQtAppsHook,
+  qtbase,
+  qttools,
   qtmultimedia,
   qtlocation,
   qqc2-desktop-style,
   kirigami-addons,
-  kirigami2,
+  kirigami,
   kio,
   knotifications,
   kquickimageedit,
@@ -18,33 +20,36 @@
   qxmpp,
   sonnet,
   gst_all_1,
+  prison,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "kaidan";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "network";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-u+8uNBDfszH5YJokie4A2QhW04ANq/JTwkMeu5gY0to=";
+    hash = "sha256-8pC4vINeKSYY+LlVgCXUtBq9UjraPdTikBOwLBLeQ3Y=";
   };
 
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
     pkg-config
+    wrapQtAppsHook
   ];
 
   buildInputs = with gst_all_1; [
-    qtquickcontrols2
+    qtbase
+    qttools
     qtmultimedia
     qtlocation
     qqc2-desktop-style
     kirigami-addons
-    kirigami2
+    kirigami
     kio
     knotifications
     kquickimageedit
@@ -54,7 +59,8 @@ mkDerivation rec {
     gstreamer
     gst-plugins-bad
     gst-plugins-base
-    gst-plugins-good
+    (gst-plugins-good.override { qt6Support = true; })
+    prison
   ];
   postInstall = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd400d32cc25..90bedbd4b087 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13946,7 +13946,7 @@ with pkgs;
 
   kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
 
-  kaidan = libsForQt5.callPackage ../applications/networking/instant-messengers/kaidan { };
+  kaidan = kdePackages.callPackage ../applications/networking/instant-messengers/kaidan { };
 
   kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { };