b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #174218 from NickCao/fcitx5-qt6

Browse source 
fcitx5-qt: add support for qt6 applications
This commit is contained in:
Guillaume Girol 2022-06-11 16:20:20 +00:00 committed by GitHub
parent 7abe5b90be 79b8d186a8
commit 419e07c382
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/i18n/input-method/fcitx5.nix
View file

@ -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 {

7
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
View file

@ -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 = [