me/guix
Archived
1
0
Fork 0
Code Activity

gnu: elogind: Build without kexec-tools on riscv64-linux.

Browse source 
* gnu/packages/freedesktop.scm (elogind)[arguments]: Only reference
kexec-tools when not building for riscv64-linux.
[inputs]: Only include kexec-tools when not building for riscv64-linux.
This commit is contained in:
Efraim Flashner 2022-02-20 15:21:39 +02:00
parent a7ad525a50
commit 1dc98567c6
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gnu/packages/freedesktop.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2015-2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015-2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2016, 2017, 2019, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -585,11 +585,15 @@ the freedesktop.org XDG Base Directory specification.")
(sysconf (string-append out "/etc")) (sysconf (string-append out "/etc"))
(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"))
(kexec-tools #$(this-package-input "kexec-tools")) #$@(if (not (target-riscv64?))
#~((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"))
(kexec-path (string-append kexec-tools "/sbin/kexec")) #$@(if (not (target-riscv64?))
#~((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")))
@ -601,7 +605,9 @@ the freedesktop.org XDG Base Directory specification.")
(string-append "-Dc_link_args=-Wl,-rpath=" libexec) (string-append "-Dc_link_args=-Wl,-rpath=" libexec)
(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)
(string-append "-Dkexec-path=" kexec-path) #$@(if (not (target-riscv64?))
#~((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)
@ -675,15 +681,18 @@ the freedesktop.org XDG Base Directory specification.")
("python" ,python) ("python" ,python)
("xsltproc" ,libxslt))) ("xsltproc" ,libxslt)))
(inputs (inputs
(list kexec-tools (append
linux-pam (if (not (target-riscv64?))
libcap (list kexec-tools)
shadow ;for 'nologin' '())
shepherd ;for 'halt' and 'reboot', invoked (list linux-pam
;when pressing the power button libcap
dbus shadow ; for 'nologin'
eudev shepherd ; for 'halt' and 'reboot', invoked
acl)) ;to add individual users to ACLs on /dev nodes ; when pressing the power button
dbus
eudev
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,