diff options
| author | Artturi <Artturin@artturin.com> | 2023-08-28 21:45:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-28 21:45:48 +0300 |
| commit | 2dd22620f3fb4c0f3f1e7a4d76156ca404f4f495 (patch) | |
| tree | 57a027e9b5025a0271618dc159eec77417f9947a | |
| parent | 7e544420c42d3537ba7c448d28ed79815386a386 (diff) | |
| parent | 49add44e4dd93514339ff2d732596b441be31a09 (diff) | |
| download | nixpkgs-2dd22620f3fb4c0f3f1e7a4d76156ca404f4f495.tar nixpkgs-2dd22620f3fb4c0f3f1e7a4d76156ca404f4f495.tar.gz nixpkgs-2dd22620f3fb4c0f3f1e7a4d76156ca404f4f495.tar.bz2 nixpkgs-2dd22620f3fb4c0f3f1e7a4d76156ca404f4f495.tar.lz nixpkgs-2dd22620f3fb4c0f3f1e7a4d76156ca404f4f495.tar.xz nixpkgs-2dd22620f3fb4c0f3f1e7a4d76156ca404f4f495.tar.zst nixpkgs-2dd22620f3fb4c0f3f1e7a4d76156ca404f4f495.zip | |
Merge pull request #247443 from amjoseph-nixpkgs/pr/openssh/withPAM
| -rw-r--r-- | pkgs/tools/networking/openssh/common.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index d29f45e8af2..2b6ea743fec 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -28,6 +28,7 @@ , hostname , nixosTests , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl +, withPAM ? stdenv.hostPlatform.isLinux , linkOpenssl ? true }: @@ -71,7 +72,7 @@ stdenv.mkDerivation { buildInputs = [ zlib openssl libedit ] ++ lib.optional withFIDO libfido2 ++ lib.optional withKerberos libkrb5 - ++ lib.optional stdenv.isLinux pam; + ++ lib.optional withPAM pam; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -88,7 +89,7 @@ stdenv.mkDerivation { "--with-mantype=man" "--with-libedit=yes" "--disable-strip" - (if stdenv.isLinux then "--with-pam" else "--without-pam") + (lib.withFeature withPAM "pam") ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" ++ lib.optional withFIDO "--with-security-key-builtin=yes" ++ lib.optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") |