fcitx5: fix and enable strictDeps (#361689)

NixOS · Jan 17, 2025 · 7d5856e · 7d5856e
2 parents 9dfdaf6 + 9737c6a
commit 7d5856e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,13 +24,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
+    gettext # msgfmt
   ];
 
   buildInputs = [
     qtbase
     fcitx5
     fcitx5-qt
-    gettext
   ];
 
   cmakeFlags = [