diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix index b4b887606e9..9ef0285f7b9 100644 --- a/nixos/modules/i18n/input-method/fcitx5.nix +++ b/nixos/modules/i18n/input-method/fcitx5.nix @@ -32,6 +32,7 @@ in { GTK_IM_MODULE = "fcitx"; QT_IM_MODULE = "fcitx"; XMODIFIERS = "@im=fcitx"; + QT_PLUGIN_PATH = [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ]; }; } (mkIf whetherRimeDataDir { diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 2b0400d8db9..b903ee6dae5 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -8,6 +8,7 @@ , libxcb , libXdmcp , qtbase +, qt6 }: mkDerivation rec { @@ -24,11 +25,15 @@ mkDerivation rec { preConfigure = '' substituteInPlace qt5/platforminputcontext/CMakeLists.txt \ --replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix} + substituteInPlace qt6/platforminputcontext/CMakeLists.txt \ + --replace \$"{CMAKE_INSTALL_QT6PLUGINDIR}" $out/${qt6.qtbase.qtPluginPrefix} ''; cmakeFlags = [ + # adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies + "-DCMAKE_PREFIX_PATH=${qt6.qtbase.dev}" "-DENABLE_QT4=0" - "-DENABLE_QT6=0" + "-DENABLE_QT6=1" ]; nativeBuildInputs = [