diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2024-01-17 11:08:35 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:25 +0200 |
| commit | ebf95b5a77cc0ae8384d22a0cd63d929edffc178 (patch) | |
| tree | a152a57017a1e8eff66594e0ff927c532a784e41 /gnu | |
| parent | bb5a44799291275da75d37a91deca93515fc6257 (diff) | |
| download | guix-ebf95b5a77cc0ae8384d22a0cd63d929edffc178.tar.gz guix-ebf95b5a77cc0ae8384d22a0cd63d929edffc178.zip | |
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
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/admin.scm | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 94c3a94765..927afb97b0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1052,9 +1052,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") @@ -1085,12 +1083,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 |