Unverified Commit 402031bf authored by Luke Granger-Brown's avatar Luke Granger-Brown Committed by GitHub
Browse files

Merge pull request #308325 from wlcx/openssh-passwd 

openssh: build with correct passwd path
parents ea77cefe 54a3d44e

pkgs/tools/networking/openssh/common.nix

+7 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
, withPAM ? stdenv.hostPlatform.isLinux

, dsaKeysSupport ? false

, linkOpenssl ? true

, isNixos ? stdenv.hostPlatform.isLinux

}:



stdenv.mkDerivation {
@@ -77,6 +78,12 @@ stdenv.mkDerivation { 
    unset LD

  '';



  env = lib.optionalAttrs isNixos {

    # openssh calls passwd to allow the user to reset an expired password, but nixos

    # doesn't ship it at /usr/bin/passwd.

    PATH_PASSWD_PROG = "/run/wrappers/bin/passwd";

  };



  # I set --disable-strip because later we strip anyway. And it fails to strip

  # properly when cross building.

  configureFlags = [