From 3b5b6649121a60507a9aede0d5acbc3ad4ecaf81 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 6 Jun 2026 23:34:27 +0300 Subject: [PATCH] qt6Packages.fcitx5-configtool: remove qt5 conditions Ever since 01fc72b3566368a219470f4ac0b456216cf5ba29 we don't distribute libsForQt5.fcitx5-configtool so the qt5 conditions are redundant. --- .../inputmethods/fcitx5/fcitx5-configtool.nix | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 360d259363a3..ac9471788ccf 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -11,20 +11,16 @@ qtsvg, qtwayland, qtdeclarative, - qtx11extras ? null, kitemviews, kwidgetsaddons, - qtquickcontrols2 ? null, kcmutils, kcoreaddons, kdeclarative, kirigami ? null, - kirigami2 ? null, isocodes, xkeyboard-config, libxkbfile, libplasma ? null, - plasma-framework ? null, wrapQtAppsHook, kcmSupport ? true, }: @@ -64,26 +60,14 @@ stdenv.mkDerivation rec { xkeyboard-config libxkbfile ] - ++ lib.optionals (lib.versions.major qtbase.version == "5") [ - qtx11extras - ] - ++ lib.optionals kcmSupport ( - [ - qtdeclarative - kcoreaddons - kdeclarative - ] - ++ lib.optionals (lib.versions.major qtbase.version == "5") [ - qtquickcontrols2 - plasma-framework - kirigami2 - ] - ++ lib.optionals (lib.versions.major qtbase.version == "6") [ - kcmutils - libplasma - kirigami - ] - ); + ++ lib.optionals kcmSupport [ + qtdeclarative + kcoreaddons + kdeclarative + kcmutils + libplasma + kirigami + ]; meta = { description = "Configuration Tool for Fcitx5";