Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Flake: add nixpkgs patches

Browse source
This commit is contained in:
Toast 2024-05-07 09:36:20 +02:00
parent aeed860735
commit 9e1ae553cf
3 changed files with 77 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -77,7 +77,10 @@
nixpkgs-unstable-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
name = "patched-nixpkgs-unstable";
src = nixpkgs-unstable-raw;
patches = [];
patches = [
./nixpkgs-patches/0001-handheld-daemon-2.6.4-2.7.2.patch
./nixpkgs-patches/0001-Revert-handheld-daemon-undo-refactor.patch
];
};
nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
name = "patched-nixpkgs";

40
nixpkgs-patches/0001-Revert-handheld-daemon-undo-refactor.patch Normal file
View file

@ -0,0 +1,40 @@
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

33
nixpkgs-patches/0001-handheld-daemon-2.6.4-2.7.2.patch Normal file
View file

@ -0,0 +1,33 @@
From 742e26325f8d5b8bcc97afd11ae188c53c6f80f1 Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Mon, 6 May 2024 11:52:09 +0200
Subject: [PATCH 1/1] handheld-daemon: 2.6.4 -> 2.7.2
---
pkgs/by-name/ha/handheld-daemon/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 246e3879bb5c..ec24637dde3f 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -9,14 +9,14 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "handheld-daemon";
- version = "2.6.4";
+ version = "2.7.2";
pyproject = true;
src = fetchFromGitHub {
owner = "hhd-dev";
repo = "hhd";
rev = "v${version}";
- hash = "sha256-S77APtE1GGfqnv1IkZdJOSlprPOBtrqVXV60yVMvopg=";
+ hash = "sha256-jWLL1nmKam1iJ1R1l/OuIp+isgZ7toRhVamx1nOID/8=";
};
propagatedBuildInputs = with python3.pkgs; [
--
2.44.0