Unverified Commit e4eea837 authored by deinferno's avatar deinferno Committed by Sandro Jäckel
Browse files

pkgsStatic.openssh: fix build

parent 367b266d

pkgs/tools/networking/openssh/common.nix

+9 −2
Original line number Diff line number Diff line
@@ -29,13 +29,17 @@ 
, libxcrypt

, hostname

, nixosTests

, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl

, withSecurityKey ? !stdenv.hostPlatform.isStatic

, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl && withSecurityKey

, withPAM ? stdenv.hostPlatform.isLinux

, dsaKeysSupport ? false

, linkOpenssl ? true

, isNixos ? stdenv.hostPlatform.isLinux

}:



# FIDO support requires SK support

assert withFIDO -> withSecurityKey;



stdenv.mkDerivation (finalAttrs: {

  inherit pname version src;
@@ -96,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.withFeature withPAM "pam")

    (lib.enableFeature dsaKeysSupport "dsa-keys")

  ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}"

    ++ lib.optional (!withSecurityKey) "--disable-security-key"

    ++ lib.optional withFIDO "--with-security-key-builtin=yes"

    ++ lib.optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}")

    ++ lib.optional stdenv.isDarwin "--disable-libutil"
@@ -103,7 +108,9 @@ stdenv.mkDerivation (finalAttrs: { 
    ++ lib.optional withLdns "--with-ldns"

    ++ extraConfigureFlags;



  ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null}= [ "-laudit" ] ++ lib.optionals withKerberos [ "-lkeyutils" ];

  ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null} = [ "-laudit" ]

    ++ lib.optional withKerberos "-lkeyutils"

    ++ lib.optional withLdns "-lcrypto";



  buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ];