From 228cc82dde1915d8574347530870901aa2d99312 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 18 Dec 2025 18:30:46 +0800
Subject: [PATCH 1/2] input-remapper: decouple routine install checks from the
 flaky upstream check

---
 .../inputmethods/input-remapper/default.nix     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix
index 719953dc2c7e..dcd83870d094 100644
--- a/pkgs/tools/inputmethods/input-remapper/default.nix
+++ b/pkgs/tools/inputmethods/input-remapper/default.nix
@@ -66,7 +66,6 @@ in
     glib
     gobject-introspection
     pygobject3
-    udevCheckHook
   ]
   ++ maybeXmodmap;
 
@@ -81,9 +80,11 @@ in
     psutil
   ];
 
-  doCheck = withDoCheck;
-
-  nativeCheckInputs = [ psutil ];
+  # buildPythonApplication maps nativeCheckInputs to nativeInstallCheckInputs.
+  nativeCheckInputs = [
+    udevCheckHook
+  ]
+  ++ lib.optionals withDoCheck [ psutil ];
 
   pythonImportsCheck = [
     "evdev"
@@ -115,9 +116,7 @@ in
   # We only run tests in the unit folder, integration tests require UI
   # To allow tests which access the system and session DBUS to run, we start a dbus session
   # and bind it to both the system and session buses
-  installCheckPhase = ''
-    runHook preInstallCheck
-
+  upstreamCheck = lib.optionalString withDoCheck ''
     echo "<busconfig>
       <type>session</type>
       <listen>unix:tmpdir=$TMPDIR</listen>
@@ -145,7 +144,11 @@ in
       DBUS_SYSTEM_BUS_ADDRESS=unix:path=/build/system_bus_socket \
       ${dbus}/bin/dbus-run-session --config-file dbus.cfg \
       python tests/test.py --start-dir unit
+  '';
 
+  installCheckPhase = ''
+    runHook preInstallCheck
+    eval "$upstreamCheck"
     runHook postInstallCheck
   '';
 

From 7a140832e209decb59711712b0912d56ce96647e Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 18 Dec 2025 18:36:48 +0800
Subject: [PATCH 2/2] input-remapper: use versionCheckHook

---
 pkgs/tools/inputmethods/input-remapper/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix
index dcd83870d094..6a27efe55775 100644
--- a/pkgs/tools/inputmethods/input-remapper/default.nix
+++ b/pkgs/tools/inputmethods/input-remapper/default.nix
@@ -20,6 +20,7 @@
   gtksourceview4,
   bash,
   udevCheckHook,
+  versionCheckHook,
   nixosTests,
   # Change the default log level to debug for easier debugging of package issues
   withDebugLogLevel ? false,
@@ -83,9 +84,12 @@ in
   # buildPythonApplication maps nativeCheckInputs to nativeInstallCheckInputs.
   nativeCheckInputs = [
     udevCheckHook
+    versionCheckHook
   ]
   ++ lib.optionals withDoCheck [ psutil ];
 
+  versionCheckProgram = "${placeholder "out"}/bin/input-remapper-control";
+
   pythonImportsCheck = [
     "evdev"
     "inputremapper"