diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-11 02:35:05 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-11 02:35:05 +0000 |
| commit | 5b262e235e0eaceadbd69b0dec4c87c452deda3f (patch) | |
| tree | 8347a36d65be1b6514f1238217b7d7ba36d5e86a /pkgs | |
| parent | 745acdd93a1fab124e9454b85d4d5721c5ec3143 (diff) | |
| download | nixlib-5b262e235e0eaceadbd69b0dec4c87c452deda3f.tar nixlib-5b262e235e0eaceadbd69b0dec4c87c452deda3f.tar.gz nixlib-5b262e235e0eaceadbd69b0dec4c87c452deda3f.tar.bz2 nixlib-5b262e235e0eaceadbd69b0dec4c87c452deda3f.tar.lz nixlib-5b262e235e0eaceadbd69b0dec4c87c452deda3f.tar.xz nixlib-5b262e235e0eaceadbd69b0dec4c87c452deda3f.tar.zst nixlib-5b262e235e0eaceadbd69b0dec4c87c452deda3f.zip | |
* Add libxcrypt for Blowfish support in pam_unix2.
svn path=/nixpkgs/trunk/; revision=7305
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libxcrypt/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam_unix2/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 17 insertions, 3 deletions
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 { |