From a709fd64e5fbaa8c4b3b9bb4b9d4cfd1e61a0fcb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Feb 2010 09:35:51 +0000
Subject: [PATCH] * 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
---
 pkgs/os-specific/linux/pam_unix2/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/pam_unix2/default.nix b/pkgs/os-specific/linux/pam_unix2/default.nix
index 090c3e9e5419..4d125d5ab831 100644
--- a/pkgs/os-specific/linux/pam_unix2/default.nix
+++ b/pkgs/os-specific/linux/pam_unix2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pam, libxcrypt ? null}:
+{ stdenv, fetchurl, pam, libxcrypt }:
    
 stdenv.mkDerivation {
   name = "pam_unix2-2.6";
@@ -8,5 +8,9 @@ stdenv.mkDerivation {
     sha256 = "067xnyd3q8ik73glxwyx1lydk4bgl78lzq44mnqqp4jrpnpd04ml";
   };
 
-  buildInputs = [pam ];
+  buildInputs = [ pam libxcrypt ];
+
+  meta = {
+    homepage = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32571c953564..bf6e23b77a13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6143,7 +6143,7 @@ let
   };
 
   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 {