From bc33d97035bd45650fd86cabe5afccca0932d284 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 28 Apr 2024 21:50:45 +1000 Subject: [PATCH] openssh: fix linkOpenSSL=false by linking libxcrypt Possibly broken during https://github.com/NixOS/nixpkgs/pull/181764 Context: https://sourceware.org/legacy-ml/libc-alpha/2017-08/msg01257.html --- pkgs/tools/networking/openssh/common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index ac5d9afd486b0..5c7b3ecb1d355 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -26,6 +26,7 @@ , withLdns ? true , libkrb5 , libfido2 +, libxcrypt , hostname , nixosTests , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl @@ -63,7 +64,8 @@ stdenv.mkDerivation { # https://github.com/NixOS/nixpkgs/pull/107606 ++ lib.optional withKerberos pkgs.libkrb5 ++ extraNativeBuildInputs; - buildInputs = [ zlib openssl libedit ] + buildInputs = [ zlib libedit ] + ++ [ (if linkOpenssl then openssl else libxcrypt) ] ++ lib.optional withFIDO libfido2 ++ lib.optional withKerberos libkrb5 ++ lib.optional withLdns ldns