diff options
Diffstat (limited to 'pkgs/tools/networking/openssh/common.nix')
-rw-r--r-- | pkgs/tools/networking/openssh/common.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 53033b57442f..55babb4ca2dc 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -20,7 +20,7 @@ , pam , etcDir ? null , withKerberos ? true -, kerberos +, libkrb5 , libfido2 , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , linkOpenssl ? true @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ] - # This is not the same as the kerberos from the inputs! pkgs.kerberos is + # This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is # needed here to access krb5-config in order to cross compile. See: # https://github.com/NixOS/nixpkgs/pull/107606 - ++ optional withKerberos pkgs.kerberos + ++ optional withKerberos pkgs.libkrb5 ++ extraNativeBuildInputs; buildInputs = [ zlib openssl libedit ] ++ optional withFIDO libfido2 - ++ optional withKerberos kerberos + ++ optional withKerberos libkrb5 ++ optional stdenv.isLinux pam; preConfigure = '' @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # Kerberos can be found either by krb5-config or by fall-back shell # code in openssh's configure.ac. Neither of them support static # build, but patching code for krb5-config is simpler, so to get it - # into PATH, kerberos.dev is added into buildInputs. + # into PATH, libkrb5.dev is added into buildInputs. + optionalString stdenv.hostPlatform.isStatic '' sed -i "s,PKGCONFIG --libs,PKGCONFIG --libs --static,g" configure sed -i 's#KRB5CONF --libs`#KRB5CONF --libs` -lkrb5support -lkeyutils#g' configure @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" ++ optional withFIDO "--with-security-key-builtin=yes" - ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") + ++ optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; |