fcitx5-configtool: build for both qt versions (6fb9849e) · Commits · nix / nixpkgs

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/top-level/aliases.nix

+1 −0

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

pkgs/top-level/all-packages.nix

+1 −3

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

		fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { };

		fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { };

		fcitx5-anthy = callPackage ../tools/inputmethods/fcitx5/fcitx5-anthy.nix { };

		fcitx5-chewing = callPackage ../tools/inputmethods/fcitx5/fcitx5-chewing.nix { };
		@@ -24402,7 +24400,7 @@ with pkgs;
		qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });

		qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix {
		inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget;
		inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
		stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
		});

pkgs/top-level/qt5-packages.nix

+2 −0

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

		fcitx5-chinese-addons = callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { };

		fcitx5-configtool = callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { };

		fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; };

		fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { };

pkgs/top-level/qt6-packages.nix

+3 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		, generateSplicesForMkScope
		, stdenv
		, pkgsHostTarget
		, kdePackages
		}:

		let
		@@ -34,6 +35,8 @@ makeScopeWithSplicing' {

		fcitx5-chinese-addons = callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { };

		fcitx5-configtool = kdePackages.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { };

		fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };

		fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; };

Admin message