From b44168aaad0c483b047038267f51b66aacbc9aa3 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 17 Jan 2006 19:06:46 +0000
Subject: [PATCH] remove stand-alone xauth (it's still somewhere in "tools"
 though), use the one in the X server instead. Make xauth and xforwarding
 optional for SSH. Enable by default.

svn path=/nixpkgs/trunk/; revision=4574
---
 pkgs/system/all-packages-generic.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 41fa48284559..b51741e17e5c 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -275,6 +275,8 @@ rec {
 
   openssh = (import ../tools/networking/openssh) {
     inherit fetchurl stdenv zlib openssl;
+    inherit (xlibs) xauth;
+    xforwarding = true;
   };
 
   mktemp = (import ../tools/security/mktemp) {
@@ -295,11 +297,6 @@ rec {
     inherit (xlibs) libX11;
   };
 
-  xauth = (import ../tools/X11/xauth) {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (xlibs) libX11 libXau libXext libXmu;
-  };
-
    
   ### SHELLS