From c6e38d30329ca883e627e8aa7a489f4d1f149c2c Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 01/12] lxqt.libqtxdg: fix build against Qt >= 6.10

---
 pkgs/desktops/lxqt/libqtxdg/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index 3ea0a857efe8..dabc9a6eb7fa 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   qtbase,
   qtsvg,
@@ -27,6 +28,16 @@ stdenv.mkDerivation rec {
       ."${version}";
   };
 
+  patches = lib.optionals (version == "4.2.0") [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/libqtxdg/pull/313)
+    # TODO: drop when upgrading beyond version 4.2.0
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/libqtxdg/commit/b01a024921acdfd5b0e97d5fda2933c726826e99.patch";
+      hash = "sha256-njpn6pU9BHlfYfkw/jEwh8w3Wo1F8MlRU8iQB+Tz2zU=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     lxqt-build-tools

From e3152f4bc7e5f15e2314d7b64f216c2a4f4aef41 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 02/12] lxqt.libqtxdg: modernize

---
 pkgs/desktops/lxqt/libqtxdg/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index dabc9a6eb7fa..b5b23b1569a8 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -12,23 +12,23 @@
   version ? "4.2.0",
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libqtxdg";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "libqtxdg";
-    rev = version;
+    tag = finalAttrs.version;
     hash =
       {
         "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
         "4.2.0" = "sha256-TSyVYlWsmB/6gxJo+CjROBQaWsmYZAwkM8BwiWP+XBI=";
       }
-      ."${version}";
+      ."${finalAttrs.version}";
   };
 
-  patches = lib.optionals (version == "4.2.0") [
+  patches = lib.optionals (finalAttrs.version == "4.2.0") [
     # fix build against Qt >= 6.10 (https://github.com/lxqt/libqtxdg/pull/313)
     # TODO: drop when upgrading beyond version 4.2.0
     (fetchpatch {
@@ -59,11 +59,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/libqtxdg";
     description = "Qt implementation of freedesktop.org xdg specs";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})

From 020a5073f18b1e21750b8513adacbce75362ea9f Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 03/12] lxqt.libfm-qt: fix build against Qt >= 6.10

---
 pkgs/desktops/lxqt/libfm-qt/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 74a5afc95c60..aef56f98f801 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   libXdmcp,
   libexif,
@@ -35,6 +36,16 @@ stdenv.mkDerivation rec {
       ."${version}";
   };
 
+  patches = lib.optionals (version == "2.2.0") [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/libfm-qt/pull/1060)
+    # TODO: drop when upgrading beyond version 2.2.0
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/libfm-qt/commit/3bcbae5831f5ce3d2f06dc370f0c2ad0026ae82a.patch";
+      hash = "sha256-nTuPXlkP7AzC8R4OHfQx6/kxPsDjaw7tGzQGyiYqQSQ=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 97bf55a00bdd3444daa7d1fef30e2318178c09d7 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 04/12] lxqt.libfm-qt: modernize

---
 pkgs/desktops/lxqt/libfm-qt/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index aef56f98f801..222b4e839514 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -20,23 +20,23 @@
   qtx11extras ? null,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libfm-qt";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "libfm-qt";
-    rev = version;
+    tag = finalAttrs.version;
     hash =
       {
         "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
         "2.2.0" = "sha256-xLXHwrcMJ8PObZ2qWVZTf9FREcjUi5qtcCJgNHj391Q=";
       }
-      ."${version}";
+      ."${finalAttrs.version}";
   };
 
-  patches = lib.optionals (version == "2.2.0") [
+  patches = lib.optionals (finalAttrs.version == "2.2.0") [
     # fix build against Qt >= 6.10 (https://github.com/lxqt/libfm-qt/pull/1060)
     # TODO: drop when upgrading beyond version 2.2.0
     (fetchpatch {
@@ -63,15 +63,15 @@ stdenv.mkDerivation rec {
     lxqt-menu-data
     menu-cache
   ]
-  ++ (lib.optionals (lib.versionAtLeast "2.0.0" version) [ qtx11extras ]);
+  ++ (lib.optionals (lib.versionAtLeast "2.0.0" finalAttrs.version) [ qtx11extras ]);
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/libfm-qt";
     description = "Core library of PCManFM-Qt (Qt binding for libfm)";
-    license = licenses.lgpl21Plus;
-    platforms = with platforms; unix;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})

From e89d3caa32e904f1d653aa8209fdfaaef5f6077f Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 05/12] lxqt.lxqt-panel: fix build against Qt >= 6.10

---
 pkgs/desktops/lxqt/lxqt-panel/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 957287946690..4e4d5d73f931 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   alsa-lib,
@@ -44,6 +45,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-ui+HD2igPiyIOgIKPbgfO4dnfm2rFP/R6oG2pH5g5VY=";
   };
 
+  patches = [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-panel/pull/2306)
+    # TODO: drop when upgrading beyond version 2.2.2
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/lxqt-panel/commit/fce8cd99a1de0e637e8539c4d8ac68832a40fa6d.patch";
+      hash = "sha256-KXxV6SZqdpvZSn+zbBZ32Qs6XKfFXEej1F4qBt+MzxA=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 4e3055e86224af8235f46931a9912f93d3fd43bf Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 06/12] lxqt.lxqt-panel: modernize

---
 pkgs/desktops/lxqt/lxqt-panel/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 4e4d5d73f931..b5893196071a 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -34,14 +34,14 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-panel";
   version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-panel";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-ui+HD2igPiyIOgIKPbgfO4dnfm2rFP/R6oG2pH5g5VY=";
   };
 
@@ -91,12 +91,12 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/lxqt-panel";
     description = "LXQt desktop panel";
     mainProgram = "lxqt-panel";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})

From 45673136b0818a0bcd501dd41028e49888feb5f5 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 07/12] lxqt.lxqt-qtplugin: fix build against Qt >= 6.10

---
 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index 8f11a11dbb96..c3078f95085d 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   libdbusmenu-lxqt,
   libfm-qt,
@@ -25,6 +26,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";
   };
 
+  patches = [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-qtplugin/pull/100)
+    # TODO: drop when upgrading beyond version 2.2.0
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/lxqt-qtplugin/commit/90473945206dbf21816a00dfba27426a5b5a9e25.patch";
+      hash = "sha256-cCghOJHsveR5IYisEFv3h8WreRDi0kuyj/2YBD+ATsc=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     lxqt-build-tools

From 96084835c500693bf12c94db871d7220d3492834 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 08/12] lxqt.lxqt-qtplugin: modernize

---
 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index c3078f95085d..db6a8b2ae8bb 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -15,14 +15,14 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-qtplugin";
   version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-qtplugin";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";
   };
 
@@ -58,11 +58,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/lxqt-qtplugin";
     description = "LXQt Qt platform integration plugin";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})

From b1f1eb2bda918793b175415dca3b7054fb0ff6c5 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:40 +0000
Subject: [PATCH 09/12] lxqt.screengrab: fix build against Qt >= 6.10

---
 pkgs/desktops/lxqt/screengrab/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index f2ef16012680..09bad89905e3 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   autoPatchelfHook,
   gitUpdater,
@@ -31,6 +32,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-6cGj3Ijv4DsAdJjcHKUg5et+yYc5miIHHZOTD2D9ASk=";
   };
 
+  patches = [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/screengrab/pull/434)
+    # TODO: drop when upgrading beyond version 3.0.0
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/screengrab/commit/1621ef5df9461cdd1dcef3faee36e9419f1ca08c.patch";
+      hash = "sha256-+rpCDLnHmgy/1PME3QaN+978W+jR6PDmiZ/5hAx8Djg=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     lxqt-build-tools

From 4490f10953a7b5350b8fc740bf40038c6d1e5724 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:40 +0000
Subject: [PATCH 10/12] lxqt.screengrab: modernize

---
 pkgs/desktops/lxqt/screengrab/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index 09bad89905e3..e93d0afce933 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -21,14 +21,14 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "screengrab";
   version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "screengrab";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-6cGj3Ijv4DsAdJjcHKUg5et+yYc5miIHHZOTD2D9ASk=";
   };
 
@@ -65,12 +65,12 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/screengrab";
     description = "Crossplatform tool for fast making screenshots";
     mainProgram = "screengrab";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})

From 7cddd344d09185de9a833023f61bfef104604a8a Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:40 +0000
Subject: [PATCH 11/12] lxqt.xdg-desktop-portal-lxqt: fix build against Qt >=
 6.10

---
 .../desktops/lxqt/xdg-desktop-portal-lxqt/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 52956cd0bc64..29cf01143dfb 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   kwindowsystem,
   libexif,
@@ -25,6 +26,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg=";
   };
 
+  patches = [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/xdg-desktop-portal-lxqt/pull/50)
+    # TODO: drop when upgrading beyond version 1.2.0
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/xdg-desktop-portal-lxqt/commit/15fae3c57a8e8149ef19a8c919f5728016390e3f.patch";
+      hash = "sha256-oReYMEr+tBDHtnFDZahBwTtzgtL/BABZO64yob9tem4=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     wrapQtAppsHook

From ea9f4739b60e933dee0d02972cdbdda94b12b856 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:40 +0000
Subject: [PATCH 12/12] lxqt.xdg-desktop-portal-lxqt: modernize

---
 .../lxqt/xdg-desktop-portal-lxqt/default.nix       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 29cf01143dfb..2836344f6ddc 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -15,14 +15,14 @@
   extraQtStyles ? [ ],
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-lxqt";
   version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "xdg-desktop-portal-lxqt";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg=";
   };
 
@@ -53,11 +53,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/xdg-desktop-portal-lxqt";
     description = "Backend implementation for xdg-desktop-portal that is using Qt/KF5/libfm-qt";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.romildo ];
   };
-}
+})