Merge pull request #279683 from NickCao/fcitx5-qt6 (3d01643d) · 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";

pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix

+38 −17

Original line number	Diff line number	Diff line
		{ lib
		, mkDerivation
		, stdenv
		, fetchFromGitHub
		, cmake
		, extra-cmake-modules
		, pkg-config
		, fcitx5
		, fcitx5-qt
		, qtx11extras
		, qtquickcontrols2
		, qtbase
		, qtsvg
		, qtwayland
		, qtdeclarative
		, qtx11extras ? null
		, kitemviews
		, kwidgetsaddons
		, qtquickcontrols2 ? null
		, kcoreaddons
		, kdeclarative
		, kirigami2
		, kirigami ? null
		, kirigami2 ? null
		, isocodes
		, xkeyboardconfig
		, libxkbfile
		, libXdmcp
		, plasma5Packages
		, plasma-framework
		, libplasma ? null
		, plasma-framework ? null
		, wrapQtAppsHook
		, kcmSupport ? true
		}:

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

		@@ -31,30 +39,43 @@ mkDerivation rec {
		};

		cmakeFlags = [
		"-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
		(lib.cmakeBool "KDE_INSTALL_USE_QT_SYS_PATHS" true)
		(lib.cmakeBool "ENABLE_KCM" kcmSupport)
		(lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
		];

		nativeBuildInputs = [
		cmake
		extra-cmake-modules
		pkg-config
		wrapQtAppsHook
		];

		buildInputs = [
		fcitx5
		fcitx5-qt
		qtx11extras
		qtquickcontrols2
		kirigami2
		qtbase
		qtsvg
		qtwayland
		kitemviews
		kwidgetsaddons
		isocodes
		xkeyboardconfig
		libxkbfile
		libXdmcp
		] ++ lib.optionals kcmSupport [
		] ++ lib.optionals (lib.versions.major qtbase.version == "5") [
		qtx11extras
		] ++ lib.optionals kcmSupport ([
		qtdeclarative
		kcoreaddons
		kdeclarative
		kwidgetsaddons
		plasma5Packages.kiconthemes
		] ++ lib.optionals (lib.versions.major qtbase.version == "5") [
		qtquickcontrols2
		plasma-framework
		];
		kirigami2
		] ++ lib.optionals (lib.versions.major qtbase.version == "6") [
		libplasma
		kirigami
		]);

		meta = with lib; {
		description = "Configuration Tool for Fcitx5";

pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix

+5 −3

Original line number	Diff line number	Diff line
		@@ -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";

pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix

+17 −3

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		, fcitx5
		, fcitx5-qt
		, gettext
		, wrapQtAppsHook
		, qtbase
		}:

		stdenv.mkDerivation rec {
		@@ -20,9 +20,23 @@ stdenv.mkDerivation rec {
		sha256 = "sha256-wrsA0gSexOZgsJunozt49GyP9R3Xe2Aci7Q8p3zAM9Q=";
		};

		nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
		nativeBuildInputs = [
		cmake
		extra-cmake-modules
		];

		buildInputs = [ fcitx5 fcitx5-qt gettext ];
		buildInputs = [
		qtbase
		fcitx5
		fcitx5-qt
		gettext
		];

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

		dontWrapQtApps = true;

		meta = with lib; {
		description = "Unikey engine support for Fcitx5";

pkgs/top-level/aliases.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,12 @@ 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-configtool = libsForQt5.fcitx5-configtool; # 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-with-addons = libsForQt5.fcitx5-with-addons; # Added 2024-03-01

		### G ###

		g4py = python3Packages.geant4; # Added 2020-06-06

Admin message