diff options
author | Armijn Hemel <armijn@gpl-violations.org> | 2006-01-17 19:06:46 +0000 |
---|---|---|
committer | Armijn Hemel <armijn@gpl-violations.org> | 2006-01-17 19:06:46 +0000 |
commit | b44168aaad0c483b047038267f51b66aacbc9aa3 (patch) | |
tree | 0b8c8fb3f06149e94eb6ce640ee27020a2905bf8 | |
parent | 6a42433ee4fecf48d159f442dc2176823985c4dc (diff) |
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
-rw-r--r-- | pkgs/system/all-packages-generic.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 41fa482845599..b51741e17e5c7 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 |