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

Merge pull request #13720 from aneeshusa/allow-compiling-openssh-without-linking-openssl

Browse Source 
openssh: allow building without linking openssl
This commit is contained in:
joachifm 2016-03-07 11:55:36 +00:00
commit 884627a6ef
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
, withKerberos ? false , withKerberos ? false
, withGssapiPatches ? withKerberos , withGssapiPatches ? withKerberos
, kerberos , kerberos
, linkOpenssl? true
}: }:
assert withKerberos -> kerberos != null; assert withKerberos -> kerberos != null;
@ -54,7 +55,8 @@ stdenv.mkDerivation rec {
(if pam != null then "--with-pam" else "--without-pam") (if pam != null then "--with-pam" else "--without-pam")
] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}"
++ optional withKerberos "--with-kerberos5=${kerberos}" ++ optional withKerberos "--with-kerberos5=${kerberos}"
++ optional stdenv.isDarwin "--disable-libutil"; ++ optional stdenv.isDarwin "--disable-libutil"
++ optional (!linkOpenssl) "--without-openssl";
preConfigure = '' preConfigure = ''
configureFlagsArray+=("--with-privsep-path=$out/empty") configureFlagsArray+=("--with-privsep-path=$out/empty")