From 33260fc800a5ed3ab7cfde48b027a218f13a58dd Mon Sep 17 00:00:00 2001
From: FliegendeWurst <2012gdwu+github@posteo.de>
Date: Wed, 4 Dec 2024 09:04:15 +0100
Subject: [PATCH 1/8] fcitx5: fix and enable strictDeps

---
 pkgs/tools/inputmethods/fcitx5/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

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 = {

From 61c29e3795392f863fbc9edb26c5f9c373759e21 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 15 Jan 2025 22:52:11 +0100
Subject: [PATCH 2/8] fcitx5-anthy: fix strictDeps build

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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; {

From af66699fd2f80cd02b98fdd191c7ad24ed1a7b1f Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 15 Jan 2025 22:52:11 +0100
Subject: [PATCH 3/8] fcitx5-chinese-addons: step towards strictDeps build

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

From 037f302906583355a6a19ed514c81dad0cc2b1e7 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 15 Jan 2025 22:52:11 +0100
Subject: [PATCH 4/8] fcitx5-lua: fix strictDeps build

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 = {

From b7c6b1bc2ed2e5e93fd5aa51a92370a674e5e13c Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 15 Jan 2025 22:52:11 +0100
Subject: [PATCH 5/8] fcitx5-qt: fix strictDeps build

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 2 ++
 1 file changed, 2 insertions(+)

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
   ];
 

From 96e51d744909eb5e4135dc854fa579bc0a22667b Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 15 Jan 2025 22:52:11 +0100
Subject: [PATCH 6/8] fcitx5-table-extra: fix strictDeps build

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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";

From 54e00997a6f752954b618b0ada8bbbe62f57cecb Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 15 Jan 2025 22:52:11 +0100
Subject: [PATCH 7/8] fcitx5-table-other: fix strictDeps build

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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";

From 9737c6a6ea8d691974030f618ae21ddcd81abd0e Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 15 Jan 2025 22:52:11 +0100
Subject: [PATCH 8/8] fcitx5-unikey: fix strictDeps build

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 = [