public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove stand-alone xauth (it's still somewhere in "tools" though), use the

Browse Source 
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:
Armijn Hemel 2006-01-17 19:06:46 +00:00
parent 6a42433ee4
commit b44168aaad
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/system/all-packages-generic.nix
View File

@ -275,6 +275,8 @@ rec {
openssh = (import ../tools/networking/openssh) { openssh = (import ../tools/networking/openssh) {
inherit fetchurl stdenv zlib openssl; inherit fetchurl stdenv zlib openssl;
inherit (xlibs) xauth;
xforwarding = true;
}; };
mktemp = (import ../tools/security/mktemp) { mktemp = (import ../tools/security/mktemp) {
@ -295,11 +297,6 @@ rec {
inherit (xlibs) libX11; inherit (xlibs) libX11;
}; };
xauth = (import ../tools/X11/xauth) {
inherit fetchurl stdenv pkgconfig;
inherit (xlibs) libX11 libXau libXext libXmu;
};
### SHELLS ### SHELLS