mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-07 11:54:33 -05:00
gnu: openssh: Remove input labels.
* gnu/packages/ssh.scm (openssh)[inputs]: Remove input labels. (openssh-sans-x)[inputs]: Use MODIFY-INPUTS.
This commit is contained in:
parent
4372610731
commit
12971d26ef
1 changed files with 12 additions and 10 deletions
|
@ -210,15 +210,16 @@ (define-public openssh
|
|||
"1s3nqv57r3l7avsdkzwd575dvxra8h19xpqczl0z3cvcgwabw3i0"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs (list groff pkg-config))
|
||||
(inputs `(("libedit" ,libedit)
|
||||
("openssl" ,openssl)
|
||||
,@(if (target-hurd?)
|
||||
'()
|
||||
`(("pam" ,linux-pam)
|
||||
("libfido2" ,libfido2))) ;fails to build on GNU/Hurd
|
||||
("mit-krb5" ,mit-krb5)
|
||||
("zlib" ,zlib)
|
||||
("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y'
|
||||
(inputs
|
||||
(cons* libedit
|
||||
openssl
|
||||
mit-krb5
|
||||
zlib
|
||||
xauth ; for 'ssh -X' and 'ssh -Y'
|
||||
(if (target-hurd?)
|
||||
'()
|
||||
(list linux-pam
|
||||
libfido2)))) ; fails to build on GNU/Hurd
|
||||
(arguments
|
||||
`(#:test-target "tests"
|
||||
;; Otherwise, the test scripts try to use a nonexistent directory and
|
||||
|
@ -324,7 +325,8 @@ (define-public openssh-sans-x
|
|||
(package
|
||||
(inherit openssh)
|
||||
(name "openssh-sans-x")
|
||||
(inputs (alist-delete "xauth" (package-inputs openssh)))
|
||||
(inputs (modify-inputs (package-inputs openssh)
|
||||
(delete "xauth")))
|
||||
(synopsis "OpenSSH client and server without X11 support")))
|
||||
|
||||
(define-public guile-ssh
|
||||
|
|
Loading…
Reference in a new issue