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 { };