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
This commit is contained in:
parent
6a42433ee4
commit
b44168aaad
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user