From e6b6a9d2a2df011dec0ef39774a7bc3cbda7a866 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 18 Apr 2022 23:19:05 +0800 Subject: [PATCH] fcitx5-qt: add support for qt6 applications --- pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index a300892e5df4..eae69ceff659 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 = [