From 271b4f12a54137cecfd2e1d93736dc86ffb98020 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 18 Jul 2024 08:38:48 -0600 Subject: [PATCH] pkgs/openssh: fido works fine with musl --- pkgs/openssh.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/openssh.nix b/pkgs/openssh.nix index ddefb07..c5f478e 100644 --- a/pkgs/openssh.nix +++ b/pkgs/openssh.nix @@ -8,11 +8,10 @@ , libfido2 , libredirect , libressl -, linkOpenssl ? true , pam , pkg-config , stdenv -, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl +, withFIDO ? stdenv.hostPlatform.isUnix , withPAM ? false , zlib , xinlib @@ -86,12 +85,12 @@ stdenv.mkDerivation { "--with-libedit=yes" "--disable-strip" "--disable-dsa-keys" + "--without-openssl" (lib.withFeature withPAM "pam") ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" ++ lib.optional withFIDO "--with-security-key-builtin=yes" - ++ lib.optional stdenv.isDarwin "--disable-libutil" - ++ lib.optional (!linkOpenssl) "--without-openssl"; + ++ lib.optional stdenv.isDarwin "--disable-libutil"; ${ if stdenv.hostPlatform.isStatic then