diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/by-name/fc/fcitx5-skk/package.nix similarity index 93% rename from pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix rename to pkgs/by-name/fc/fcitx5-skk/package.nix index 0bf72df3c504..32b7c95e56e3 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/pkgs/by-name/fc/fcitx5-skk/package.nix @@ -7,9 +7,9 @@ kdePackages, gettext, fcitx5, - fcitx5-qt, libskk, - qtbase, + qt6, + qt6Packages, skkDictionaries, enableQt ? false, }: @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { libskk ] ++ lib.optionals enableQt [ - fcitx5-qt - qtbase + qt6Packages.fcitx5-qt + qt6.qtbase ]; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 426b41d2a2fa..3b9a43a312e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2207,8 +2207,6 @@ with pkgs; Fabric = with python3Packages; toPythonApplication fabric; - fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { }; - fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; }; flannel = callPackage ../tools/networking/flannel { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index d17adae73183..85e7bc2b9d16 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -53,7 +53,7 @@ makeScopeWithSplicing' { fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; - fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; }; + fcitx5-skk-qt = pkgs.fcitx5-skk.override { enableQt = true; }; fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { };