diff options
author | Nick Cao <nickcao@nichi.co> | 2024-01-08 16:11:12 -0500 |
---|---|---|
committer | Nick Cao <nickcao@nichi.co> | 2024-03-01 10:44:06 -0500 |
commit | 0b5b74bbeb4b881b2d4e9c4fb87fcca72fe99301 (patch) | |
tree | f58346b78ff0f439dcf72e270f5c01007caff0b8 /pkgs/tools/inputmethods | |
parent | 9336fcc5ae4fa579b6f3fb7f0e68277d875ec435 (diff) |
fcitx5-skk: build for both qt versions
Diffstat (limited to 'pkgs/tools/inputmethods')
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index 3bb5f66a51483..6cfced6a632e6 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -10,7 +10,6 @@ , libskk , qtbase , skk-dicts -, wrapQtAppsHook , enableQt ? false }: @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { extra-cmake-modules gettext pkg-config - ] ++ lib.optional enableQt wrapQtAppsHook; + ]; buildInputs = [ fcitx5 @@ -41,10 +40,13 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DENABLE_QT=${toString enableQt}" + (lib.cmakeBool "ENABLE_QT" enableQt) + (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6")) "-DSKK_DEFAULT_PATH=${skk-dicts}/share/SKK-JISYO.L" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Input method engine for Fcitx5, which uses libskk as its backend"; homepage = "https://github.com/fcitx/fcitx5-skk"; |