From 57cbe42cc2e91853217408168607ac14b16792f2 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 2 Apr 2026 16:50:08 -0400 Subject: [PATCH 1/2] elogind: fixup hardcoded references to /sbin --- pkgs/by-name/el/elogind/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/el/elogind/package.nix b/pkgs/by-name/el/elogind/package.nix index b08378bb96a1..c04853ffc773 100644 --- a/pkgs/by-name/el/elogind/package.nix +++ b/pkgs/by-name/el/elogind/package.nix @@ -35,6 +35,9 @@ enableSystemd ? false, }: +let + system = "/run/current-system/sw"; +in stdenv.mkDerivation (finalAttrs: { pname = "elogind"; version = "255.5"; @@ -148,6 +151,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d") (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services") (lib.mesonOption "sysconfdir" "${placeholder "out"}/etc") + (lib.mesonOption "halt-path" "${system}/bin/halt") + (lib.mesonOption "poweroff-path" "${system}/bin/poweroff") + (lib.mesonOption "reboot-path" "${system}/bin/reboot") (lib.mesonBool "utmp" (!stdenv.hostPlatform.isMusl)) (lib.mesonEnable "xenctrl" false) ]; From 90187790bc8fbace37b65ef404ed95f7dde1bb70 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 2 Apr 2026 16:52:36 -0400 Subject: [PATCH 2/2] elogind: fixup rules to work with eudev --- pkgs/by-name/el/elogind/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/el/elogind/package.nix b/pkgs/by-name/el/elogind/package.nix index c04853ffc773..5861d9926dcf 100644 --- a/pkgs/by-name/el/elogind/package.nix +++ b/pkgs/by-name/el/elogind/package.nix @@ -86,6 +86,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace meson.build --replace-fail "install_emptydir(elogindstatedir)" "" + '' + + lib.optionalString (!enableSystemd) '' + substituteInPlace ./rules.d/71-seat.rules.in --replace-fail "{{BINDIR}}/udevadm" "${eudev}/bin/udevadm" ''; patches = [