Merge pull request #304154 from CnTeng/pam_rssh

pam_rssh: fix openssh without dsa support
This commit is contained in:
Ilan Joselevich 2024-04-16 11:39:42 +03:00 committed by GitHub
commit 140e6a0e37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,11 +1,12 @@
{ lib {
, rustPlatform lib,
, fetchFromGitHub rustPlatform,
, coreutils fetchFromGitHub,
, pkg-config coreutils,
, openssl pkg-config,
, pam openssl,
, openssh pam,
openssh,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -28,9 +29,7 @@ rustPlatform.buildRustPackage rec {
--replace '/bin/false' '${coreutils}/bin/false' --replace '/bin/false' '${coreutils}/bin/false'
''; '';
nativeBuildInputs = [ nativeBuildInputs = [ pkg-config ];
pkg-config
];
buildInputs = [ buildInputs = [
openssl openssl
@ -42,9 +41,7 @@ rustPlatform.buildRustPackage rec {
"--skip=tests::parse_user_authorized_keys" "--skip=tests::parse_user_authorized_keys"
]; ];
nativeCheckInputs = [ nativeCheckInputs = [ (openssh.override { dsaKeysSupport = true; }) ];
openssh
];
env.USER = "nixbld"; env.USER = "nixbld";