Unverified Commit 08947d94 authored by Aaron Andersen's avatar Aaron Andersen Committed by GitHub
Browse files

elogind: various fixes (#506122)

parents 645fd11e 90187790
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@
  enableSystemd ? false,
}:

let
  system = "/run/current-system/sw";
in
stdenv.mkDerivation (finalAttrs: {
  pname = "elogind";
  version = "255.5";
@@ -83,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 = [
@@ -148,6 +154,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)
  ];