From 904067bc281924e86e936c7d0162131e8af86d64 Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Mon, 6 May 2024 12:26:54 +0200
Subject: [PATCH 1/1] Revert "handheld-daemon: undo refactor"

This reverts commit d9b487ae609a368378c1a9d89a5441c5c44121df.
---
 pkgs/by-name/ha/handheld-daemon/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 246e3879bb5c..ad0554bec36d 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -34,15 +34,17 @@ python3.pkgs.buildPythonApplication rec {
   doCheck = false;
 
   postPatch = ''
+    # The generated udev rules point to /bin/chmod, which does not exist in NixOS
+    substituteInPlace src/hhd/controller/lib/hide.py \
+      --replace-fail /bin/chmod ${toybox}/bin/chmod
+
     # handheld-daemon contains a fork of the python module `hid`, so this hook
     # is borrowed from the `hid` derivation.
+    substituteInPlace src/hhd/controller/lib/hid.py \
+      --replace-fail libhidapi ${hidapi}/lib/libhidapi
+
     hidapi=${hidapi}/lib/
     test -d $hidapi || { echo "ERROR: $hidapi doesn't exist, please update/fix this build expression."; exit 1; }
-    sed -i -e "s|libhidapi|$hidapi/libhidapi|" src/hhd/controller/lib/hid.py
-
-    # The generated udev rules point to /bin/chmod, which does not exist in NixOS
-    chmod=${toybox}/bin/chmod
-    sed -i -e "s|/bin/chmod|$chmod|" src/hhd/controller/lib/hide.py
   '';
 
   postInstall = ''
-- 
2.44.0