From 31b65676c346681e09b3db4a8a8a7a552ccf384a Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 5 May 2025 11:45:22 +0200 Subject: [PATCH] upower: add patch to fix udevadm verify issues --- pkgs/by-name/up/upower/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/up/upower/package.nix b/pkgs/by-name/up/upower/package.nix index 529d2e43ee93..b0c0c09573d3 100644 --- a/pkgs/by-name/up/upower/package.nix +++ b/pkgs/by-name/up/upower/package.nix @@ -71,6 +71,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.freedesktop.org/upower/upower/-/commit/9ee76826bd41a5d3a377dfd6f5835f42ec50be9a.patch"; hash = "sha256-E56iz/iHn+VM7Opo0a13A5nhnB9nf6C7Y1kyWzk4ZnU="; }) + # Fix style issues in the udev rules file + (fetchpatch { + url = "https://gitlab.freedesktop.org/upower/upower/-/commit/6f9d84694da56b317989b8c34250b60d833a4b29.patch"; + hash = "sha256-xBUbf4qz9Llmw7CuKKMp/uPk7JqwjB4+p7z9kMOVRuE="; + }) ]; strictDeps = true; @@ -163,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs src/linux/unittest_inspector.py substituteInPlace src/linux/integration-test.py \ - --replace "/usr/share/dbus-1" "$out/share/dbus-1" + --replace-fail "/usr/share/dbus-1" "$out/share/dbus-1" ''; preCheck = ''