fcitx5-chinese-addons: build for both qt versions (45e4e8f9) · Commits · nix / nixpkgs

pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix

+9 −2

Original line number	Diff line number	Diff line
		{ lib
		, mkDerivation
		, stdenv
		, fetchurl
		, fetchFromGitHub
		, cmake
		@@ -13,6 +13,7 @@
		, opencc
		, curl
		, fmt
		, qtbase
		, luaSupport ? true
		}:

		@@ -29,7 +30,7 @@ let
		};
		in

		mkDerivation rec {
		stdenv.mkDerivation rec {
		pname = "fcitx5-chinese-addons";
		version = "5.1.4";

		@@ -62,6 +63,12 @@ mkDerivation rec {
		fmt
		] ++ lib.optional luaSupport fcitx5-lua;

		cmakeFlags = [
		(lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
		];

		dontWrapQtApps = true;

		meta = with lib; {
		description = "Addons related to Chinese, including IME previous bundled inside fcitx4";
		homepage = "https://github.com/fcitx/fcitx5-chinese-addons";

+1 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,7 @@ mapAliases ({
		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

		fcitx5-chinese-addons = libsForQt5.fcitx5-chinese-addons; # Added 2024-03-01
		fcitx5-skk-qt = libsForQt5.fcitx5-skk-qt; # Added 2024-03-01
		fcitx5-unikey = libsForQt5.fcitx5-unikey; # Added 2024-03-01

+0 −2

Original line number	Diff line number	Diff line
		@@ -8048,8 +8048,6 @@ with pkgs;

		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 {
		abseil-cpp = abseil-cpp.override {
		cxxStandard = "17";

+2 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP

		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-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { };

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ makeScopeWithSplicing' {
		accounts-qt = callPackage ../development/libraries/accounts-qt { };
		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-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; };