diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 8b88e94b5e1b..6267021e208c 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -34,6 +34,7 @@ , xcb-imdkit , libxkbfile , nixosTests +, gettext }: let enDictVer = "20121020"; @@ -62,9 +63,11 @@ stdenv.mkDerivation rec { extra-cmake-modules pkg-config wayland-scanner + gettext ]; buildInputs = [ + extra-cmake-modules # required to please CMake expat fmt isocodes @@ -94,6 +97,8 @@ stdenv.mkDerivation rec { libxkbfile ]; + strictDeps = true; + passthru = { updateScript = ./update.py; tests = { diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix index a9c3d561561c..b604a7e838bf 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + gettext # msgfmt pkg-config zstd ]; buildInputs = [ fcitx5 anthy - gettext ]; meta = with lib; { diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index bc8da47b5e37..101db511b155 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -6,6 +6,7 @@ cmake, extra-cmake-modules, boost, + gettext, libime, fcitx5, fcitx5-qt, @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules - boost + gettext fcitx5-lua ]; @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ + boost fcitx5 fcitx5-qt libime diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 3f4eeb16855a..ec040d344998 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + gettext ]; buildInputs = [ fcitx5 lua - gettext ]; passthru = { diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 0028eb5fc4e6..e7ada4963a1a 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -5,6 +5,7 @@ cmake, extra-cmake-modules, fcitx5, + gettext, qtbase, qtwayland, wrapQtAppsHook, @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + gettext wrapQtAppsHook ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 467321147145..4d8845c0c2d3 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -26,10 +26,13 @@ stdenv.mkDerivation rec { extra-cmake-modules gettext libime - boost fcitx5 ]; + buildInputs = [ + boost + ]; + meta = with lib; { description = "Extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick"; homepage = "https://github.com/fcitx/fcitx5-table-extra"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index 5dc95a6186d5..8a584ec67202 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -26,10 +26,13 @@ stdenv.mkDerivation rec { extra-cmake-modules gettext libime - boost fcitx5 ]; + buildInputs = [ + boost + ]; + meta = with lib; { description = "Some other tables for Fcitx"; homepage = "https://github.com/fcitx/fcitx5-table-other"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index d0d4f515fafe..07ae7b36fb77 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + gettext # msgfmt ]; buildInputs = [ qtbase fcitx5 fcitx5-qt - gettext ]; cmakeFlags = [