gnu: elogind: Drop input labels and fix indentation.

* gnu/packages/freedesktop.scm (elogind): Re-indent package.
[native-inputs]: Remove labels.
This commit is contained in:
Maxim Cournoyer 2023-07-27 12:43:14 -04:00
parent c88fe11209
commit 3309bb8ac2
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -663,14 +663,14 @@ (define-public elogind
(libexec (string-append out "/libexec/elogind")) (libexec (string-append out "/libexec/elogind"))
(dbuspolicy (string-append out "/etc/dbus-1/system.d")) (dbuspolicy (string-append out "/etc/dbus-1/system.d"))
#$@(if (not (target-riscv64?)) #$@(if (not (target-riscv64?))
#~((kexec-tools #$(this-package-input "kexec-tools"))) #~((kexec-tools #$(this-package-input "kexec-tools")))
#~()) #~())
(shadow #$(this-package-input "shadow")) (shadow #$(this-package-input "shadow"))
(shepherd #$(this-package-input "shepherd")) (shepherd #$(this-package-input "shepherd"))
(halt-path (string-append shepherd "/sbin/halt")) (halt-path (string-append shepherd "/sbin/halt"))
#$@(if (not (target-riscv64?)) #$@(if (not (target-riscv64?))
#~((kexec-path (string-append kexec-tools "/sbin/kexec"))) #~((kexec-path (string-append kexec-tools "/sbin/kexec")))
#~()) #~())
(nologin-path (string-append shadow "/sbin/nologin")) (nologin-path (string-append shadow "/sbin/nologin"))
(poweroff-path (string-append shepherd "/sbin/shutdown")) (poweroff-path (string-append shepherd "/sbin/shutdown"))
(reboot-path (string-append shepherd "/sbin/reboot"))) (reboot-path (string-append shepherd "/sbin/reboot")))
@ -683,8 +683,8 @@ (define-public elogind
(string-append "-Dcpp_link_args=-Wl,-rpath=" libexec) (string-append "-Dcpp_link_args=-Wl,-rpath=" libexec)
(string-append "-Dhalt-path=" halt-path) (string-append "-Dhalt-path=" halt-path)
#$@(if (not (target-riscv64?)) #$@(if (not (target-riscv64?))
#~((string-append "-Dkexec-path=" kexec-path)) #~((string-append "-Dkexec-path=" kexec-path))
#~()) #~())
(string-append "-Dpoweroff-path=" poweroff-path) (string-append "-Dpoweroff-path=" poweroff-path)
(string-append "-Dreboot-path=" reboot-path) (string-append "-Dreboot-path=" reboot-path)
(string-append "-Dnologin-path=" nologin-path) (string-append "-Dnologin-path=" nologin-path)
@ -754,29 +754,29 @@ (define-public elogind
(substitute* "src/login/elogind.c" (substitute* "src/login/elogind.c"
(("\"/run/elogind.pid\"") "\"/run/systemd/elogind.pid\""))))))) (("\"/run/elogind.pid\"") "\"/run/systemd/elogind.pid\"")))))))
(native-inputs (native-inputs
`(("docbook-xml" ,docbook-xml-4.5) (list docbook-xml-4.5
("docbook-xml-4.2" ,docbook-xml-4.2) docbook-xml-4.2
("docbook-xsl" ,docbook-xsl) docbook-xsl
("gettext" ,gettext-minimal) gettext-minimal
("gperf" ,gperf) gperf
("libxml2" ,libxml2) ;for XML_CATALOG_FILES libxml2 ;for XML_CATALOG_FILES
("m4" ,m4) m4
("pkg-config" ,pkg-config) pkg-config
("python" ,python) python
("xsltproc" ,libxslt))) libxslt))
(inputs (inputs
(append (append
(if (not (target-riscv64?)) (if (not (target-riscv64?))
(list kexec-tools) (list kexec-tools)
'()) '())
(list linux-pam (list linux-pam
libcap libcap
shadow ; for 'nologin' shadow ; for 'nologin'
shepherd ; for 'halt' and 'reboot', invoked shepherd ; for 'halt' and 'reboot', invoked
; when pressing the power button ; when pressing the power button
dbus dbus
eudev eudev
acl))) ; to add individual users to ACLs on /dev nodes acl))) ; to add individual users to ACLs on /dev nodes
(home-page "https://github.com/elogind/elogind") (home-page "https://github.com/elogind/elogind")
(synopsis "User, seat, and session management service") (synopsis "User, seat, and session management service")
(description "Elogind is the systemd project's \"logind\" service, (description "Elogind is the systemd project's \"logind\" service,