From 5b262e235e0eaceadbd69b0dec4c87c452deda3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 02:35:05 +0000
Subject: * Add libxcrypt for Blowfish support in pam_unix2.

svn path=/nixpkgs/trunk/; revision=7305
---
 pkgs/development/libraries/libxcrypt/default.nix | 10 ++++++++++
 pkgs/os-specific/linux/pam_unix2/default.nix     |  4 ++--
 pkgs/top-level/all-packages.nix                  |  6 +++++-
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/libxcrypt/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix
new file mode 100644
index 000000000000..37a032fdefa3
--- /dev/null
+++ b/pkgs/development/libraries/libxcrypt/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+   
+stdenv.mkDerivation {
+  name = "libxcrypt-2.4";
+   
+  src = fetchurl {
+    url = ftp://ftp.suse.com/pub/people/kukuk/libxcrypt/libxcrypt-2.4.tar.bz2;
+    md5 = "b5ae266550af2d04423da7d3af08a82a";
+  };
+}
diff --git a/pkgs/os-specific/linux/pam_unix2/default.nix b/pkgs/os-specific/linux/pam_unix2/default.nix
index ad13ab9bbc9f..b89f6ba4f3fd 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}:
+{stdenv, fetchurl, pam, libxcrypt}:
    
 stdenv.mkDerivation {
   name = "pam_unix2-2.1";
@@ -8,5 +8,5 @@ stdenv.mkDerivation {
     md5 = "08d3bc1940897b5dfcbe2f51dd979ad0";
   };
 
-  buildInputs = [pam];
+  buildInputs = [pam libxcrypt];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae3e738e62d0..52c4434fc3ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1499,6 +1499,10 @@ rec {
     inherit (gnome) glib;
   };
 
+  libxcrypt = import ../development/libraries/libxcrypt {
+    inherit fetchurl stdenv;
+  };
+
   libxml2 = import ../development/libraries/libxml2 {
     inherit fetchurl stdenv zlib python;
 #    pythonSupport = stdenv.system == "i686-linux";
@@ -2192,7 +2196,7 @@ rec {
   };
 
   pam_unix2 = import ../os-specific/linux/pam_unix2 {
-    inherit stdenv fetchurl pam;
+    inherit stdenv fetchurl pam libxcrypt;
   };
 
   procps = import ../os-specific/linux/procps {
-- 
cgit 1.4.1