[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
29/38: gnu: freedesktop: Unconditionally use alternatives to % variables
From: |
guix-commits |
Subject: |
29/38: gnu: freedesktop: Unconditionally use alternatives to % variables. |
Date: |
Sat, 2 Oct 2021 12:52:45 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit a4c40efa0558804b9d641c6624cfe06a668a6af6
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Oct 1 16:21:31 2021 +0200
gnu: freedesktop: Unconditionally use alternatives to % variables.
* gnu/packages/freedesktop.scm
(elogind)[arguments]<#:configure-flags>: Use #$output and
this-package-input
instead of %outputs and %build-inputs.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/freedesktop.scm | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 550253b..9bcf2d8 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -583,20 +583,12 @@ the freedesktop.org XDG Base Directory specification.")
(build-system meson-build-system)
(arguments
`(#:configure-flags
- ;; TODO(core-updates): Use #$output unconditionally.
- ,#~(let* ((out #$(if (%current-target-system)
- #~#$output
- #~(assoc-ref %outputs "out")))
+ ,#~(let* ((out #$output)
(sysconf (string-append out "/etc"))
(libexec (string-append out "/libexec/elogind"))
(dbuspolicy (string-append out "/etc/dbus-1/system.d"))
- ;; TODO(core-updates): use this-package-input unconditionally.
- (shadow #$(if (%current-target-system)
- (this-package-input "shadow")
- #~(assoc-ref %build-inputs "shadow")))
- (shepherd #$(if (%current-target-system)
- (this-package-input "shepherd")
- #~(assoc-ref %build-inputs "shepherd")))
+ (shadow #$(this-package-input "shadow"))
+ (shepherd #$(this-package-input "shepherd"))
(halt-path (string-append shepherd "/sbin/halt"))
(kexec-path "") ;not available in Guix yet
(nologin-path (string-append shadow "/sbin/nologin"))
- 14/38: gnu: cairo: Make 'bash-minimal' input unconditional., (continued)
- 14/38: gnu: cairo: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 15/38: gnu: libthai: Make 'datrie' input unconditional., guix-commits, 2021/10/02
- 17/38: gnu: pango: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 13/38: gnu: gobject-introspection: Use python instead of python-wrapper., guix-commits, 2021/10/02
- 21/38: gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 20/38: gnu: gdk-pixbuf: Use target predicates., guix-commits, 2021/10/02
- 23/38: gnu: at-spi2-core: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 26/38: gnu: at-spi2-core: Remove trailing #t., guix-commits, 2021/10/02
- 27/38: gnu: avahi: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 28/38: gnu: avahi: Make the 'patch-more-shebangs' phase unconditional., guix-commits, 2021/10/02
- 29/38: gnu: freedesktop: Unconditionally use alternatives to % variables.,
guix-commits <=
- 30/38: gnu: wayland: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 18/38: gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 22/38: gnu: gdk-pixbuf: Remove trailing #t., guix-commits, 2021/10/02
- 25/38: gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 12/38: gnu: gobject-introspection: Move things to native-inputs., guix-commits, 2021/10/02
- 19/38: gnu: gdk-pixbuf: Respect #:tests?., guix-commits, 2021/10/02
- 24/38: gnu: at-spi2-core: Respect #:tests?., guix-commits, 2021/10/02
- 32/38: gnu: json-glib: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 34/38: gnu: heimdal: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 38/38: lint: check-wrapper-inputs: Remove mentions of core-updates., guix-commits, 2021/10/02