From b014af78911d4f4a627175b61498bf12b5784350 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 15 Apr 2024 00:37:09 +0200 Subject: [PATCH] Flake: update nixpkgs patch --- .../0001-handheld-daemon-1.1.0-2.6.2.patch | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/nixpkgs-patches/0001-handheld-daemon-1.1.0-2.6.2.patch b/nixpkgs-patches/0001-handheld-daemon-1.1.0-2.6.2.patch index 278be1f..d620cfb 100644 --- a/nixpkgs-patches/0001-handheld-daemon-1.1.0-2.6.2.patch +++ b/nixpkgs-patches/0001-handheld-daemon-1.1.0-2.6.2.patch @@ -1,7 +1,7 @@ From d9e4af9ae8ed30a1ab860915c5c0ff9ae0c16dc1 Mon Sep 17 00:00:00 2001 From: Toast <39011842+toast003@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:32:24 +0200 -Subject: [PATCH 1/2] handheld-daemon: 1.1.0 -> 2.6.2 +Subject: [PATCH 1/3] handheld-daemon: 1.1.0 -> 2.6.2 --- pkgs/by-name/ha/handheld-daemon/package.nix | 5 +++-- @@ -40,7 +40,7 @@ index bb0c9d65bfe19d..b5f25f339ffb60 100644 From 2a8d54c511bda43bea18d35d2c08f224f3352a18 Mon Sep 17 00:00:00 2001 From: Toast <39011842+toast003@users.noreply.github.com> Date: Sat, 13 Apr 2024 15:42:25 +0200 -Subject: [PATCH 2/2] handheld-daemon: update license +Subject: [PATCH 2/3] handheld-daemon: update license --- pkgs/by-name/ha/handheld-daemon/package.nix | 2 +- @@ -59,3 +59,37 @@ index b5f25f339ffb60..f0ce6e9648e3e8 100644 maintainers = with maintainers; [ appsforartists ]; mainProgram = "hhd"; }; + +From 3b96a3c082f6b0e9f7e2eabcc18cf599a0c7eb63 Mon Sep 17 00:00:00 2001 +From: Toast <39011842+toast003@users.noreply.github.com> +Date: Mon, 15 Apr 2024 00:31:56 +0200 +Subject: [PATCH 3/3] handheld-daemon: patch generated udev rules to use chmod + from nix store + +--- + pkgs/by-name/ha/handheld-daemon/package.nix | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix +index f0ce6e9648e3e8..72981284e2e9c1 100644 +--- a/pkgs/by-name/ha/handheld-daemon/package.nix ++++ b/pkgs/by-name/ha/handheld-daemon/package.nix +@@ -5,6 +5,7 @@ + , lib + , python3 + , toybox ++, coreutils + }: + python3.pkgs.buildPythonApplication rec { + pname = "handheld-daemon"; +@@ -38,6 +39,10 @@ python3.pkgs.buildPythonApplication rec { + 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/chroot, which does not exist in NixOS ++ chmod=${ coreutils }/bin/chmod ++ sed -i -e "s|/bin/chmod|$chmod|" src/hhd/controller/lib/hide.py + ''; + + postInstall = ''