diff options
author | Graham Christensen <graham@grahamc.com> | 2018-01-28 16:34:04 -0500 |
---|---|---|
committer | Graham Christensen <graham@grahamc.com> | 2018-01-28 16:36:01 -0500 |
commit | e2a54266c411e71bb5e65d9523766782728a1c3f (patch) | |
tree | 530092405b2a92a94b54e308eb418fe4a232faea /pkgs/tools/networking | |
parent | 15a49774091b55172036fe1f8de96e349e9f0674 (diff) | |
download | nixlib-e2a54266c411e71bb5e65d9523766782728a1c3f.tar nixlib-e2a54266c411e71bb5e65d9523766782728a1c3f.tar.gz nixlib-e2a54266c411e71bb5e65d9523766782728a1c3f.tar.bz2 nixlib-e2a54266c411e71bb5e65d9523766782728a1c3f.tar.lz nixlib-e2a54266c411e71bb5e65d9523766782728a1c3f.tar.xz nixlib-e2a54266c411e71bb5e65d9523766782728a1c3f.tar.zst nixlib-e2a54266c411e71bb5e65d9523766782728a1c3f.zip |
openssh: Build with Kerberos by default
This reverts commit 09696e32c390c232ec7ac506df6457fb93c1f536. which reverted f596aa0f4a35f613422f85a4486e32ea20ca7739 to move it to staging
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 663e7be7e5f3..1c135cd36f48 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,15 +1,12 @@ { stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false -, withKerberos ? false +, withKerberos ? true , withGssapiPatches ? false , kerberos , linkOpenssl? true }: -assert withKerberos -> kerberos != null; -assert withGssapiPatches -> withKerberos; - let # **please** update this patch when you update to a new openssh release. @@ -23,8 +20,6 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - # Please ensure that openssh_with_kerberos still builds when - # bumping the version here! name = "openssh-${version}"; version = if hpnSupport then "7.5p1" else "7.6p1"; @@ -47,7 +42,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] - ++ optional withGssapiPatches gssapiPatch; + ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); postPatch = # On Hydra this makes installation fail (sometimes?), @@ -59,7 +54,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib openssl libedit pam ] ++ optional withKerberos kerberos - ++ optional hpnSupport autoreconfHook; + ++ optional hpnSupport autoreconfHook + ; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -78,7 +74,7 @@ stdenv.mkDerivation rec { "--disable-strip" (if pam != null then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" - ++ optional withKerberos "--with-kerberos5=${kerberos}" + ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; |