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

make X forwarding optional. If enabled "xauth" is a dependency

Browse Source 
svn path=/nixpkgs/trunk/; revision=4573
This commit is contained in:
Armijn Hemel 2006-01-17 18:48:18 +00:00
parent 13d2ab0322
commit 6a42433ee4
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/networking/openssh/builder.sh
View File

@ -1,5 +1,10 @@
source $stdenv/setup source $stdenv/setup
if test -n "$xauth"; then
configureFlags="--with-xauth=$xauth"
fi
installPhase() { installPhase() {
make install-nokeys make install-nokeys
} }

8
pkgs/tools/networking/openssh/default.nix
View File

@ -1,4 +1,6 @@
{stdenv, fetchurl, zlib, openssl}: {stdenv, fetchurl, zlib, openssl, xforwarding ? false, xauth ? null}:
assert xforwarding -> xauth != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "openssh-3.8.1p1"; name = "openssh-3.8.1p1";
@ -9,5 +11,7 @@ stdenv.mkDerivation {
md5 = "1dbfd40ae683f822ae917eebf171ca42"; md5 = "1dbfd40ae683f822ae917eebf171ca42";
}; };
buildInputs = [zlib openssl]; buildInputs = [zlib openssl
(if xforwarding then xauth else null)
];
} }