From c4bf62f1c058710ddd627ac53ab998e4e6ac378b Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 19 Apr 2025 06:42:40 +0000
Subject: [PATCH 1/2] xcb-imdkit: fix cross compilation

---
 pkgs/by-name/xc/xcb-imdkit/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/xc/xcb-imdkit/package.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix
index 538b84c1c4bf..9d92138bd5d1 100644
--- a/pkgs/by-name/xc/xcb-imdkit/package.nix
+++ b/pkgs/by-name/xc/xcb-imdkit/package.nix
@@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
+    extra-cmake-modules
     xorgproto
     uthash
   ];
 
   buildInputs = [
-    extra-cmake-modules
     xcbutil
     xcbutilkeysyms
   ];

From 0ad42cabe13a47b74130a7b3f1f781804664c9f5 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 19 Apr 2025 06:41:13 +0000
Subject: [PATCH 2/2] fcitx5: fix cross compilation

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

diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index 325c1a7e6b3b..c9aa1cd19899 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -4,6 +4,7 @@
   fetchurl,
   fetchFromGitHub,
   pkg-config,
+  buildPackages,
   cmake,
   extra-cmake-modules,
   wayland-scanner,
@@ -68,7 +69,6 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    extra-cmake-modules # required to please CMake
     expat
     fmt
     isocodes
@@ -98,6 +98,10 @@ stdenv.mkDerivation rec {
     libxkbfile
   ];
 
+  cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    (lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages))
+  ];
+
   strictDeps = true;
 
   passthru = {