guix-commits
[Top][All Lists]
Advanced

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

01/05: gnu: openssh: Remove exception to build without xauth for the Hur


From: guix-commits
Subject: 01/05: gnu: openssh: Remove exception to build without xauth for the Hurd.
Date: Mon, 8 Jun 2020 11:36:37 -0400 (EDT)

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 4a6974667e838c82ae375c8b9c1b3eaca7a72ac4
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Mon Jun 8 15:03:05 2020 +0200

    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.
---
 gnu/packages/ssh.scm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 43764a8..d42971d 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -43,7 +43,6 @@
   #:use-module (gnu packages groff)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages libedit)
-  #:use-module (gnu packages hurd)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages logging)
   #:use-module (gnu packages m4)
@@ -150,9 +149,7 @@ a server that supports the SSH-2 protocol.")
              ("pam" ,linux-pam)
              ("mit-krb5" ,mit-krb5)
              ("zlib" ,zlib)
-             ,@(if (hurd-target?)
-                   '()
-                   `(("xauth" ,xauth)))))         ; for 'ssh -X' and 'ssh -Y'
+             ("xauth" ,xauth)))        ; for 'ssh -X' and 'ssh -Y'
    (arguments
     `(#:test-target "tests"
       ;; Otherwise, the test scripts try to use a nonexistent directory and



reply via email to

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