From b1f109dad55c6ab4c4c1e4289f5cef74689756cf Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Wed, 31 May 2023 22:09:39 +0200
Subject: [PATCH 1/2] usbrelay: 1.0.1 -> 1.2

---
 pkgs/os-specific/linux/usbrelay/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/usbrelay/default.nix b/pkgs/os-specific/linux/usbrelay/default.nix
index c5b4f2b8a53f..43407f405a85 100644
--- a/pkgs/os-specific/linux/usbrelay/default.nix
+++ b/pkgs/os-specific/linux/usbrelay/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchFromGitHub, hidapi, installShellFiles }:
 stdenv.mkDerivation rec {
   pname = "usbrelay";
-  version = "1.0.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "darrylb123";
     repo = "usbrelay";
     rev = version;
-    sha256 = "sha256-2elDrO+WaaRYdTrG40Ez00qSsNVQjXE6GdOJbWPfugE=";
+    sha256 = "sha256-oJyHzbXOBKxLmPFZMS2jLF80frkiKjPJ89UwkenjIzs=";
   };
 
   nativeBuildInputs = [
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "DIR_VERSION=${version}"
     "PREFIX=${placeholder "out"}"
+    "LDCONFIG=${stdenv.cc.libc.bin}/bin/ldconfig"
   ];
 
   postInstall = ''

From bc10438fd7e09cccf4215f27cf42af506e3119f0 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Fri, 2 Jun 2023 08:21:37 +0200
Subject: [PATCH 2/2] usbrelay: Convert to finalAttrs and remove unused rec

---
 pkgs/os-specific/linux/usbrelay/daemon.nix  | 2 +-
 pkgs/os-specific/linux/usbrelay/default.nix | 8 ++++----
 pkgs/os-specific/linux/usbrelay/python.nix  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/usbrelay/daemon.nix b/pkgs/os-specific/linux/usbrelay/daemon.nix
index 7aa1c3f153bb..6e4e4661fd53 100644
--- a/pkgs/os-specific/linux/usbrelay/daemon.nix
+++ b/pkgs/os-specific/linux/usbrelay/daemon.nix
@@ -5,7 +5,7 @@ in
 # This is a separate derivation, not just an additional output of
 # usbrelay, because otherwise, we have a cyclic dependency between
 # usbrelay (default.nix) and the python module (python.nix).
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "usbrelayd";
 
   inherit (usbrelay) src version;
diff --git a/pkgs/os-specific/linux/usbrelay/default.nix b/pkgs/os-specific/linux/usbrelay/default.nix
index 43407f405a85..385f4da1142d 100644
--- a/pkgs/os-specific/linux/usbrelay/default.nix
+++ b/pkgs/os-specific/linux/usbrelay/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchFromGitHub, hidapi, installShellFiles }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "usbrelay";
   version = "1.2";
 
   src = fetchFromGitHub {
     owner = "darrylb123";
     repo = "usbrelay";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-oJyHzbXOBKxLmPFZMS2jLF80frkiKjPJ89UwkenjIzs=";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = [
-    "DIR_VERSION=${version}"
+    "DIR_VERSION=${finalAttrs.version}"
     "PREFIX=${placeholder "out"}"
     "LDCONFIG=${stdenv.cc.libc.bin}/bin/ldconfig"
   ];
@@ -35,4 +35,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ wentasah ];
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/os-specific/linux/usbrelay/python.nix b/pkgs/os-specific/linux/usbrelay/python.nix
index b87798940909..90838295ecb5 100644
--- a/pkgs/os-specific/linux/usbrelay/python.nix
+++ b/pkgs/os-specific/linux/usbrelay/python.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage, usbrelay }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "usbrelay_py";
   inherit (usbrelay) version src;