guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/06: gnu: shadow: Remove input labels.


From: guix-commits
Subject: 03/06: gnu: shadow: Remove input labels.
Date: Wed, 17 Jan 2024 05:29:19 -0500 (EST)

civodul pushed a commit to branch core-updates
in repository guix.

commit ac691e17476bc614134398da7cf93aec584f86a5
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Jan 17 11:08:35 2024 +0100

    gnu: shadow: Remove input labels.
    
    * gnu/packages/admin.scm (shadow)[arguments]: In ‘set-runtime-shell’,
    use ‘search-input-file’.
    [inputs]: Remove labels.
    
    Change-Id: I1ce9d93f425c77f901d8e21b37d1a069824cab45
---
 gnu/packages/admin.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 4365c03ba1..a379890a41 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1032,9 +1032,7 @@ hostname.")
          ,@(if (%current-target-system)
                '((add-before 'configure 'set-runtime-shell
                    (lambda* (#:key inputs #:allow-other-keys)
-                     (let ((shell (string-append
-                                   (assoc-ref inputs "bash")
-                                   "/bin/bash")))
+                     (let ((shell (search-input-file inputs "/bin/bash")))
                        (setenv "RUNTIME_SHELL" shell)
                        (substitute* "configure.ac"
                          (("\\$SHELL")
@@ -1065,12 +1063,12 @@ hostname.")
                (delete-file (string-append bin "/groups"))
                (for-each delete-file (find-files man "^groups\\."))))))))
     (inputs
-     `(,@(if (target-hurd?)
-           '()
-           `(("linux-pam" ,linux-pam)))
-       ,@(if (%current-target-system)
-             `(("bash" ,bash-minimal))
-             '())))
+     (append (if (target-hurd?)
+                 '()
+                 (list linux-pam))
+             (if (%current-target-system)
+                 (list bash-minimal)
+                 '())))
     (home-page "https://github.com/shadow-maint/shadow";)
     (synopsis "Authentication-related tools such as passwd, su, and login")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]