colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fcitx5-chinese-addons: build for both qt versions

Browse Source
This commit is contained in:
Nick Cao 2024-01-07 01:00:43 -05:00
parent 51f1291ea5
commit 45e4e8f973
No known key found for this signature in database
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
View File

@ -1,5 +1,5 @@
{ lib { lib
, mkDerivation , stdenv
, fetchurl , fetchurl
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
@ -13,6 +13,7 @@
, opencc , opencc
, curl , curl
, fmt , fmt
, qtbase
, luaSupport ? true , luaSupport ? true
}: }:
@ -29,7 +30,7 @@ let
}; };
in in
mkDerivation rec { stdenv.mkDerivation rec {
pname = "fcitx5-chinese-addons"; pname = "fcitx5-chinese-addons";
version = "5.1.4"; version = "5.1.4";
@ -62,6 +63,12 @@ mkDerivation rec {
fmt fmt
] ++ lib.optional luaSupport fcitx5-lua; ] ++ lib.optional luaSupport fcitx5-lua;
cmakeFlags = [
(lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
];
dontWrapQtApps = true;
meta = with lib; { meta = with lib; {
description = "Addons related to Chinese, including IME previous bundled inside fcitx4"; description = "Addons related to Chinese, including IME previous bundled inside fcitx4";
homepage = "https://github.com/fcitx/fcitx5-chinese-addons"; homepage = "https://github.com/fcitx/fcitx5-chinese-addons";

1
pkgs/top-level/aliases.nix
View File

@ -321,6 +321,7 @@ mapAliases ({
fcitx-engines = throw "fcitx-engines is deprecated, please use fcitx5 instead."; # Added 2023-03-13 fcitx-engines = throw "fcitx-engines is deprecated, please use fcitx5 instead."; # Added 2023-03-13
fcitx-configtool = throw "fcitx-configtool is deprecated, please use fcitx5 instead."; # Added 2023-03-13 fcitx-configtool = throw "fcitx-configtool is deprecated, please use fcitx5 instead."; # Added 2023-03-13
fcitx5-chinese-addons = libsForQt5.fcitx5-chinese-addons; # Added 2024-03-01
fcitx5-skk-qt = libsForQt5.fcitx5-skk-qt; # Added 2024-03-01 fcitx5-skk-qt = libsForQt5.fcitx5-skk-qt; # Added 2024-03-01
fcitx5-unikey = libsForQt5.fcitx5-unikey; # Added 2024-03-01 fcitx5-unikey = libsForQt5.fcitx5-unikey; # Added 2024-03-01

2
pkgs/top-level/all-packages.nix
View File

@ -8048,8 +8048,6 @@ with pkgs;
fcitx5-bamboo = callPackage ../tools/inputmethods/fcitx5/fcitx5-bamboo.nix { }; fcitx5-bamboo = callPackage ../tools/inputmethods/fcitx5/fcitx5-bamboo.nix { };
fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { };
fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix {
abseil-cpp = abseil-cpp.override { abseil-cpp = abseil-cpp.override {
cxxStandard = "17"; cxxStandard = "17";

2
pkgs/top-level/qt5-packages.nix
View File

@ -100,6 +100,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };
fcitx5-chinese-addons = callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { };
fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; }; fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; };
fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { }; fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { };

2
pkgs/top-level/qt6-packages.nix
View File

@ -32,6 +32,8 @@ makeScopeWithSplicing' {
accounts-qt = callPackage ../development/libraries/accounts-qt { }; accounts-qt = callPackage ../development/libraries/accounts-qt { };
appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };
fcitx5-chinese-addons = callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { };
fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };
fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; }; fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; };