diff options
author | Graham Christensen <graham@grahamc.com> | 2018-01-28 16:32:52 -0500 |
---|---|---|
committer | Graham Christensen <graham@grahamc.com> | 2018-01-28 16:32:52 -0500 |
commit | f596aa0f4a35f613422f85a4486e32ea20ca7739 (patch) | |
tree | 52b59e28a84c43ab18f17ff55f647c8b3950f6b0 /pkgs/tools | |
parent | a232dd66ee0b390dc4d82858af7e15713bd60327 (diff) | |
download | nixlib-f596aa0f4a35f613422f85a4486e32ea20ca7739.tar nixlib-f596aa0f4a35f613422f85a4486e32ea20ca7739.tar.gz nixlib-f596aa0f4a35f613422f85a4486e32ea20ca7739.tar.bz2 nixlib-f596aa0f4a35f613422f85a4486e32ea20ca7739.tar.lz nixlib-f596aa0f4a35f613422f85a4486e32ea20ca7739.tar.xz nixlib-f596aa0f4a35f613422f85a4486e32ea20ca7739.tar.zst nixlib-f596aa0f4a35f613422f85a4486e32ea20ca7739.zip |
Revert "openssh: Build with Kerberos by default"
This reverts commit a232dd66ee0b390dc4d82858af7e15713bd60327. Moving to staging
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1c135cd36f48..663e7be7e5f3 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false -, withKerberos ? true +, withKerberos ? false , 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. @@ -20,6 +23,8 @@ 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"; @@ -42,7 +47,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] - ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); + ++ optional withGssapiPatches gssapiPatch; postPatch = # On Hydra this makes installation fail (sometimes?), @@ -54,8 +59,7 @@ 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 @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { "--disable-strip" (if pam != null then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" - ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") + ++ optional withKerberos "--with-kerberos5=${kerberos}" ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; |