Merge https://github.com/NixOS/nixpkgs

1 files changed, 14 insertions, 4 deletions

diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 0d9d1d42c0fb..64f3b81edde9 100644
--- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@@ -13,10 +13,14 @@
 , qttools
 , wrapQtAppsHook
 , gitUpdater
-}:
 
+, qt5Kvantum ? null
+}:
+let
+  isQt6 = lib.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation rec {
-  pname = "qtstyleplugin-kvantum";
+  pname = "qtstyleplugin-kvantum${lib.optionalString isQt6 "6"}";
   version = "1.0.10";
 
   src = fetchFromGitHub {
@@ -37,8 +41,8 @@ stdenv.mkDerivation rec {
     qtsvg
     libX11
     libXext
-  ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ qtx11extras kwindowsystem ]
-    ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland;
+  ] ++ lib.optionals (!isQt6) [ qtx11extras kwindowsystem ]
+    ++ lib.optional isQt6 qtwayland;
 
   sourceRoot = "${src.name}/Kvantum";
 
@@ -57,6 +61,12 @@ stdenv.mkDerivation rec {
       --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
   '';
 
+  postInstall = lib.optionalString isQt6 ''
+    # make default Kvantum themes available for Qt 6 apps
+    mkdir -p "$out/share"
+    ln -s "${qt5Kvantum}/share/Kvantum" "$out/share/Kvantum"
+  '';
+
   passthru.updateScript = gitUpdater {
     rev-prefix = "V";
   };