diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/inputmethods/fcitx5')
11 files changed, 90 insertions, 46 deletions
diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix index a3b5e180bcfb..865134947be5 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-XI4E+fWDIYDiYBv6HezytaZmhzv4NUaNam1T5Fyx+LI="; + hash = "sha256-MeknggrpOzpkT1EXZCftIrlevuMEEHM5d8vszKRp+DI="; }; prePatch = '' diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 385043ef9a29..0699f23e3aab 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , fetchurl , fetchFromGitHub , cmake @@ -13,6 +13,7 @@ , opencc , curl , fmt +, qtbase , luaSupport ? true }: @@ -29,15 +30,15 @@ let }; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-z+udRjvAZbnu6EcvvdaFVCr0OKLxFBJbgoYpH9QjrDI="; + sha256 = "sha256-OqVoXZ8SIO8KRs3ehxul9Ug4sV47cxVCbLCBh6/8EoE="; }; nativeBuildInputs = [ @@ -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"; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index b726a3515508..f0553a5d52f7 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -1,60 +1,81 @@ { 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.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-IwGlhIeON0SenW738p07LWZAzVDMtxOSMuUIAgfmTEg="; + sha256 = "sha256-jYO1jdiuDjt6e98qhwMpTQTnGxoIYWMKkORGJbmk3mk="; }; 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"; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 1036b28685c3..6be9e49886f8 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Ex24cHTsYsZjP8o+vrCdgGogk1UotWpd8xaLZAqzgaQ="; + sha256 = "sha256-iNqY/VORDEPR4rc0LjVgcojZlMcT+LBdrdOwBkC5Vkk="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 9a1a2c8eca24..23aabde1e653 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-3gkZh+ZzgTdpTbQe92gxJlG0x6Yhl7LfMiFEq5mb92o="; + sha256 = "sha256-S5TGjb5vD0rk7V88b4yRziszLrwO1pgVFWuEGMp48oY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 5311d20ffa32..b0cd6dc6d59b 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fcitx"; - repo = pname; + repo = "fcitx5-qt"; rev = version; sha256 = "sha256-bVH2US/uEZGERslnAh/fyUbzR9fK1UfG4J+mOmrIE8Y="; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 3698abeed8aa..4fecf46e5e3b 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-tbCIWenH5brJUVIsmOiw/E/uIXAWwK1yangIVlkeOAs="; + hash = "sha256-/eVgF5kgf1gmbkOInoGbmH/eH0vO2xj3X6k+wzeEssM="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index 31ecbed35bc9..6cfced6a632e 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -10,19 +10,18 @@ , libskk , qtbase , skk-dicts -, wrapQtAppsHook , enableQt ? false }: stdenv.mkDerivation rec { pname = "fcitx5-skk"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-a+ZsuFEan61U0oOuhrTFoK5J4Vd0jj463jQ8Mk7TdbA="; + sha256 = "sha256-vg79zJ/ZoUjCKU11krDUjO0rAyZxDMsBnHqJ/I6NTTA="; }; nativeBuildInputs = [ @@ -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"; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 0320fa5c4f01..dea3e2d03802 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-w4JFZvYFL3fHrDgZqYND2bl3lT9/O1GXgfOwR7WyzWY="; + hash = "sha256-Lb8CYFQl48arJEn9gemZ7imD/gdKjN+7Wnm21/0/Sko="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index b0129a923438..410413bf30d8 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-ymHAKaPmQckxM/XHoDOVSzEWpyQGb7zVG21CDwNfyjg="; + sha256 = "sha256-G34hPEdcdi5agWiFEgUHWD18ozOgBCaoS6HMAklUcO4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index aa87d725f104..a1a077264b3a 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -6,23 +6,37 @@ , fcitx5 , fcitx5-qt , gettext -, wrapQtAppsHook +, qtbase }: stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.1.2"; + version = "5.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - sha256 = "sha256-tLooADS8HojS9i178i5FJVqZtKrTXlzOBPlE9K49Tjc="; + 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"; |