3
0
Fork 0
forked from mirrors/nixpkgs

* Turn libxcrypt back on. Without it, it's impossible to login to

NixOS (because pam_unix2 then cannot handle the passwords in
  /etc/shadow).

svn path=/nixpkgs/branches/stdenv-updates/; revision=19810
This commit is contained in:
Eelco Dolstra 2010-02-04 09:35:51 +00:00
parent e38e9988a1
commit a709fd64e5
2 changed files with 7 additions and 3 deletions

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, pam, libxcrypt ? null}: { stdenv, fetchurl, pam, libxcrypt }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pam_unix2-2.6"; name = "pam_unix2-2.6";
@ -8,5 +8,9 @@ stdenv.mkDerivation {
sha256 = "067xnyd3q8ik73glxwyx1lydk4bgl78lzq44mnqqp4jrpnpd04ml"; sha256 = "067xnyd3q8ik73glxwyx1lydk4bgl78lzq44mnqqp4jrpnpd04ml";
}; };
buildInputs = [pam ]; buildInputs = [ pam libxcrypt ];
meta = {
homepage = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2;
};
} }

View file

@ -6143,7 +6143,7 @@ let
}; };
pam_unix2 = import ../os-specific/linux/pam_unix2 { pam_unix2 = import ../os-specific/linux/pam_unix2 {
inherit stdenv fetchurl pam; inherit stdenv fetchurl pam libxcrypt;
}; };
pam_usb = import ../os-specific/linux/pam_usb { pam_usb = import ../os-specific/linux/pam_usb {