From 3ce4e70bda0612ae39604352f18eb25392658106 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 27 Mar 2023 15:19:36 +0200
Subject: [PATCH] qt6Packages.qtstyleplugin-kvantum: init at 1.0.10

This adds Qt 6 support to qtstyleplugin-kvantum. Note that this package
only includes the style plugin and not the actual configuration UI.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../libraries/qtstyleplugin-kvantum/default.nix      | 12 ++++++------
 pkgs/top-level/qt6-packages.nix                      |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 01458c0e7c6e..af4f194efc80 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@@ -5,8 +5,9 @@
 , qmake
 , qtbase
 , qtsvg
-, qtx11extras
-, kwindowsystem
+, qtx11extras ? null
+, kwindowsystem ? null
+, qtwayland
 , libX11
 , libXext
 , qttools
@@ -34,11 +35,10 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase
     qtsvg
-    qtx11extras
-    kwindowsystem
     libX11
     libXext
-  ];
+  ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ qtx11extras kwindowsystem ]
+    ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland;
 
   sourceRoot = "source/Kvantum";
 
@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tsujan/Kvantum";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.romildo ];
+    maintainers = with maintainers; [ romildo Scrumplex ];
   };
 }
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 4381f4ab89b4..cd79c0392cb2 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -37,6 +37,8 @@ in
 
   qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };
 
+  qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { };
+
   quazip = callPackage ../development/libraries/quazip { };
 
   qxlsx = callPackage ../development/libraries/qxlsx { };