diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 0d9d1d42c0fb..64f3b81edde9 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/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"; }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 792be6b3efda..bc10fe2b99d6 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -30,7 +30,9 @@ in qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; - qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { }; + qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { + qt5Kvantum = pkgs.libsForQt5.qtstyleplugin-kvantum; + }; quazip = callPackage ../development/libraries/quazip { };