GNU bug report logs - #50905
[PATCH core-updates 00/38] Clean up TODO(core-updates)

Previous Next

Full log

Message #119 received at 50905 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: 50905 <at> debbugs.gnu.org
Cc: Maxime Devos <maximedevos <at> telenet.be>
Subject: [PATCH 29/38] gnu: freedesktop: Unconditionally use alternatives to %
 variables.
Date: Thu, 30 Sep 2021 00:19:29 +0200

* gnu/packages/freedesktop.scm
  (elogind)[arguments]<#:configure-flags>: Use #$output and this-package-input
  instead of %outputs and %build-inputs.
---
 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 550253bc34..9bcf2d8d3e 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"))
-- 
2.33.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.