Merge pull request #304154 from CnTeng/pam_rssh
pam_rssh: fix openssh without dsa support
This commit is contained in:
commit
140e6a0e37
1 changed files with 11 additions and 14 deletions
|
@ -1,11 +1,12 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, coreutils
|
||||
, pkg-config
|
||||
, openssl
|
||||
, pam
|
||||
, openssh
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
coreutils,
|
||||
pkg-config,
|
||||
openssl,
|
||||
pam,
|
||||
openssh,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
@ -28,9 +29,7 @@ rustPlatform.buildRustPackage rec {
|
|||
--replace '/bin/false' '${coreutils}/bin/false'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
|
@ -42,9 +41,7 @@ rustPlatform.buildRustPackage rec {
|
|||
"--skip=tests::parse_user_authorized_keys"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
openssh
|
||||
];
|
||||
nativeCheckInputs = [ (openssh.override { dsaKeysSupport = true; }) ];
|
||||
|
||||
env.USER = "nixbld";
|
||||
|
||||
|
|
Loading…
Reference in a new issue