Unverified Commit 140e6a0e authored by Ilan Joselevich's avatar Ilan Joselevich Committed by GitHub
Browse files

Merge pull request #304154 from CnTeng/pam_rssh

pam_rssh: fix openssh without dsa support
parents b987e0c6 95560d55
Loading
Loading
Loading
Loading
+11 −14
Original line number Diff line number Diff line
{ 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";