Merge pull request #174218 from NickCao/fcitx5-qt6
fcitx5-qt: add support for qt6 applications
This commit is contained in:
commit
419e07c382
|
@ -32,6 +32,7 @@ in {
|
||||||
GTK_IM_MODULE = "fcitx";
|
GTK_IM_MODULE = "fcitx";
|
||||||
QT_IM_MODULE = "fcitx";
|
QT_IM_MODULE = "fcitx";
|
||||||
XMODIFIERS = "@im=fcitx";
|
XMODIFIERS = "@im=fcitx";
|
||||||
|
QT_PLUGIN_PATH = [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
(mkIf whetherRimeDataDir {
|
(mkIf whetherRimeDataDir {
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
, libxcb
|
, libxcb
|
||||||
, libXdmcp
|
, libXdmcp
|
||||||
, qtbase
|
, qtbase
|
||||||
|
, qt6
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
|
@ -24,11 +25,15 @@ mkDerivation rec {
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
substituteInPlace qt5/platforminputcontext/CMakeLists.txt \
|
substituteInPlace qt5/platforminputcontext/CMakeLists.txt \
|
||||||
--replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix}
|
--replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix}
|
||||||
|
substituteInPlace qt6/platforminputcontext/CMakeLists.txt \
|
||||||
|
--replace \$"{CMAKE_INSTALL_QT6PLUGINDIR}" $out/${qt6.qtbase.qtPluginPrefix}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
# adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies
|
||||||
|
"-DCMAKE_PREFIX_PATH=${qt6.qtbase.dev}"
|
||||||
"-DENABLE_QT4=0"
|
"-DENABLE_QT4=0"
|
||||||
"-DENABLE_QT6=0"
|
"-DENABLE_QT6=1"
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
Loading…
Reference in a new issue