* Remove the xauth dependency in openssh. We can set the xauth path

  in sshd_config.

svn path=/nixpkgs/trunk/; revision=7547

1 files changed, 0 insertions, 5 deletions

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index ea0bba196b28..640993460c7e 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,15 +1,12 @@
 { stdenv, fetchurl, zlib, openssl, perl
 , pamSupport ? false, pam ? null
-, xforwarding ? false, xauth ? null
 }:
 
 assert pamSupport -> pam != null;
-assert xforwarding -> xauth != null;
  
 stdenv.mkDerivation {
   name = "openssh-4.5p1";
  
-  #builder = ./builder.sh;
   src = fetchurl {
     url = ftp://sunsite.cnlab-switch.ch/pub/OpenBSD/OpenSSH/portable/openssh-4.5p1.tar.gz;
     md5 = "6468c339886f78e8a149b88f695839dd";
@@ -17,11 +14,9 @@ stdenv.mkDerivation {
  
   buildInputs = [zlib openssl perl
     (if pamSupport then pam else null)
-    (if xforwarding then xauth else null)
   ];
 
   configureFlags = "
-    ${if xforwarding then "--with-xauth=${xauth}/bin/xauth" else ""}
     ${if pamSupport then "--with-pam" else ""}
   ";