From 125dd5bd42a6cfd81160afc4c8fa9366060845e2 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon@is.currently.online>
Date: Sun, 5 Jan 2025 08:48:31 -0500
Subject: [PATCH 1/2] usbkvm: 0.1.0 -> 0.2.0

---
 pkgs/by-name/us/usbkvm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/us/usbkvm/package.nix b/pkgs/by-name/us/usbkvm/package.nix
index 19547c8fcacf..df0c3c9b33e5 100644
--- a/pkgs/by-name/us/usbkvm/package.nix
+++ b/pkgs/by-name/us/usbkvm/package.nix
@@ -15,11 +15,11 @@
 }:
 
 let
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchzip {
     url = "https://github.com/carrotIndustries/usbkvm/releases/download/v${version}/usbkvm-v${version}.tar.gz";
-    sha256 = "sha256-OuZ7+IjsvK7/PaiTRwssaQFJDFWJ8HX+kqV13CUyTZA=";
+    sha256 = "sha256-ng6YpaN7sKEBPJcJAm0kcYtT++orweWRx6uOZFnOGG8=";
   };
 
   ms-tools-lib = buildGoModule {

From b7c362f87cf042f3dcf69e368cd3dca4279c4bc5 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon@is.currently.online>
Date: Sun, 5 Jan 2025 09:17:56 -0500
Subject: [PATCH 2/2] usbkvm: remove udev rules hack, use udevrulesdir meson
 option

---
 pkgs/by-name/us/usbkvm/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/us/usbkvm/package.nix b/pkgs/by-name/us/usbkvm/package.nix
index df0c3c9b33e5..f24a2d707a04 100644
--- a/pkgs/by-name/us/usbkvm/package.nix
+++ b/pkgs/by-name/us/usbkvm/package.nix
@@ -11,6 +11,7 @@
   pkg-config,
   python3,
   stdenv,
+  udev,
   wrapGAppsHook3,
 }:
 
@@ -51,6 +52,7 @@ stdenv.mkDerivation {
     ninja
     makeWrapper
     wrapGAppsHook3
+    udev
   ];
 
   buildInputs = [
@@ -71,6 +73,11 @@ stdenv.mkDerivation {
       --replace-fail "@MSLIB_H_PRECOMPILED@" "${ms-tools-lib}/mslib.h"
   '';
 
+  # Install udev rules in this package's out path:
+  mesonFlags = [
+    "-Dudevrulesdir=lib/udev/rules.d"
+  ];
+
   postFixup =
     let
       GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
@@ -83,11 +90,6 @@ stdenv.mkDerivation {
         --prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}"
     '';
 
-  postInstall = ''
-    mkdir -p $out/lib/udev/rules.d/
-    cp ../70-usbkvm.rules $out/lib/udev/rules.d/
-  '';
-
   meta = {
     homepage = "https://github.com/carrotIndustries/usbkvm";
     description = "An open-source USB KVM (Keyboard, Video and Mouse) adapter";