gnu: openssh: Remove exception to build without xauth for the Hurd.

* gnu/packages/ssh.scm (openssh)[inputs]: Unconditionally include xauth;
for the Hurd: use openssh-sans-x for now.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-06-08 15:03:05 +02:00 committed by Jan Nieuwenhuizen
parent 8176ce6fde
commit 4a6974667e
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273

View file

@ -43,7 +43,6 @@ (define-module (gnu packages ssh)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages libedit) #:use-module (gnu packages libedit)
#:use-module (gnu packages hurd)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages logging) #:use-module (gnu packages logging)
#:use-module (gnu packages m4) #:use-module (gnu packages m4)
@ -150,9 +149,7 @@ (define-public openssh
("pam" ,linux-pam) ("pam" ,linux-pam)
("mit-krb5" ,mit-krb5) ("mit-krb5" ,mit-krb5)
("zlib" ,zlib) ("zlib" ,zlib)
,@(if (hurd-target?) ("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y'
'()
`(("xauth" ,xauth))))) ; for 'ssh -X' and 'ssh -Y'
(arguments (arguments
`(#:test-target "tests" `(#:test-target "tests"
;; Otherwise, the test scripts try to use a nonexistent directory and ;; Otherwise, the test scripts try to use a nonexistent directory and