From c775a485f7cc83f4519eac896afbf6816ca4ad48 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 26 Feb 2025 19:27:21 +0100
Subject: [PATCH] qxmpp: 1.10.0 -> 1.10.1

---
 pkgs/development/libraries/qxmpp/default.nix | 17 ++++++++++-------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix
index 4fd0b0656ca7..3fbabba69469 100644
--- a/pkgs/development/libraries/qxmpp/default.nix
+++ b/pkgs/development/libraries/qxmpp/default.nix
@@ -1,28 +1,30 @@
-{ mkDerivation
+{ stdenv
 , lib
 , fetchFromGitHub
 , cmake
 , pkg-config
+, wrapQtAppsNoGuiHook
+, qtbase
+, qca
 , withGstreamer ? true
 , gst_all_1
 , withOmemo ? true
-, qca-qt5
 , libomemo-c
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qxmpp";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "qxmpp-project";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-pM0KxYoGMIukj5SX1MX5v4VJz5/zwNmaLP717o5++Ec=";
+    hash = "sha256-mb8JMBV5M+0hFJLTxwYE47jB/FJKi/MPUwd3Nhan+QQ=";
   };
 
   nativeBuildInputs = [
-    cmake
+    cmake wrapQtAppsNoGuiHook
   ] ++ lib.optionals (withGstreamer || withOmemo) [
     pkg-config
   ];
@@ -32,7 +34,8 @@ mkDerivation rec {
     gst-plugins-base
     gst-plugins-good
   ]) ++ lib.optionals withOmemo [
-    qca-qt5
+    qtbase
+    qca
     libomemo-c
   ];
   cmakeFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd1df376f72d..cd400d32cc25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9017,7 +9017,7 @@ with pkgs;
     inherit (darwin.apple_sdk_12_3.libs) xpc;
   });
 
-  qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp { };
+  qxmpp = qt6Packages.callPackage ../development/libraries/qxmpp { };
 
   gnu-efi = if stdenv.hostPlatform.isEfi
               then callPackage ../development/libraries/gnu-efi { }