amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: shadow: Remove input labels.

Browse source 
* gnu/packages/admin.scm (shadow)[arguments]: In ‘set-runtime-shell’,
use ‘search-input-file’.
[inputs]: Remove labels.

Change-Id: I1ce9d93f425c77f901d8e21b37d1a069824cab45
This commit is contained in:
Ludovic Courtès 2024-01-17 11:08:35 +01:00
parent bb5a447992
commit ebf95b5a77
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/admin.scm
View file

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