mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-17 17:58:35 +00:00
make X forwarding optional. If enabled "xauth" is a dependency
svn path=/nixpkgs/trunk/; revision=4573
This commit is contained in:
parent
13d2ab0322
commit
6a42433ee4
@ -1,5 +1,10 @@
|
||||
source $stdenv/setup
|
||||
|
||||
|
||||
if test -n "$xauth"; then
|
||||
configureFlags="--with-xauth=$xauth"
|
||||
fi
|
||||
|
||||
installPhase() {
|
||||
make install-nokeys
|
||||
}
|
||||
|
@ -1,4 +1,6 @@
|
||||
{stdenv, fetchurl, zlib, openssl}:
|
||||
{stdenv, fetchurl, zlib, openssl, xforwarding ? false, xauth ? null}:
|
||||
|
||||
assert xforwarding -> xauth != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "openssh-3.8.1p1";
|
||||
@ -9,5 +11,7 @@ stdenv.mkDerivation {
|
||||
md5 = "1dbfd40ae683f822ae917eebf171ca42";
|
||||
};
|
||||
|
||||
buildInputs = [zlib openssl];
|
||||
buildInputs = [zlib openssl
|
||||
(if xforwarding then xauth else null)
|
||||
];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user