From b49208bf55e4d1ca98fc4d46d9c4ad56f532b959 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 16 Jun 2025 07:10:25 +0800
Subject: [PATCH] usbguard-notifier: 0.1.0 -> 0.1.1

Diff: https://github.com/Cropi/usbguard-notifier/compare/usbguard-notifier-0.1.0...usbguard-notifier-0.1.1
---
 pkgs/by-name/us/usbguard-notifier/package.nix | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/us/usbguard-notifier/package.nix b/pkgs/by-name/us/usbguard-notifier/package.nix
index 806373d109e8..ba9adbd40060 100644
--- a/pkgs/by-name/us/usbguard-notifier/package.nix
+++ b/pkgs/by-name/us/usbguard-notifier/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   autoreconfHook,
   pkg-config,
   libqb,
@@ -13,32 +12,29 @@
   asciidoc,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "usbguard-notifier";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "Cropi";
     repo = "usbguard-notifier";
-    rev = "usbguard-notifier-${version}";
-    hash = "sha256-gWvCGSbOuey2ELAPD2WCG4q77IClL0S7rE2RaUJDc1I=";
+    tag = "usbguard-notifier-${finalAttrs.version}";
+    hash = "sha256-EP+NUzT5nu7rJeSEyxs/JARVx7jH2Vip73ksmQw+ABM=";
   };
 
-  patches = [
-    # gcc-13 compatibility upstream fix:
-    #   https://github.com/Cropi/usbguard-notifier/pull/74
-    (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/Cropi/usbguard-notifier/commit/f4586b732c8a7379aacbc9899173beeacfd54793.patch";
-      hash = "sha256-2q/qD6yEQUPxA/UutGIZKFJ3hHJ8ZlGMZI1wJyMRbmo=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace-fail 'AC_MSG_FAILURE([Cannot detect the systemd system unit dir])' \
+        'systemd_unit_dir="$out/lib/systemd/user"'
+  '';
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
     asciidoc
   ];
+
   buildInputs = [
     libqb
     usbguard
@@ -48,12 +44,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "CPPFLAGS=-I${catch2}/include/catch2" ];
 
-  prePatch = ''
-    substituteInPlace configure.ac \
-      --replace 'AC_MSG_FAILURE([Cannot detect the systemd system unit dir])' \
-        'systemd_unit_dir="$out/lib/systemd/user"'
-  '';
-
   meta = {
     description = "Notifications for detecting usbguard policy and device presence changes";
     homepage = "https://github.com/Cropi/usbguard-notifier";
@@ -62,4 +52,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     mainProgram = "usbguard-notifier";
   };
-}
+})