diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-18 11:40:32 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-18 11:40:32 +0000 |
| commit | bd124ec21a8c49d94821e3ba767e4a46a680e985 (patch) | |
| tree | 1a701b9b1c9874bf6f7de4a23056f85d25bed045 /pkgs/os-specific/linux/pam | |
| parent | 6d62e290a01431df2f895a3ad22f35c7b70437ea (diff) | |
| download | nixlib-bd124ec21a8c49d94821e3ba767e4a46a680e985.tar nixlib-bd124ec21a8c49d94821e3ba767e4a46a680e985.tar.gz nixlib-bd124ec21a8c49d94821e3ba767e4a46a680e985.tar.bz2 nixlib-bd124ec21a8c49d94821e3ba767e4a46a680e985.tar.lz nixlib-bd124ec21a8c49d94821e3ba767e4a46a680e985.tar.xz nixlib-bd124ec21a8c49d94821e3ba767e4a46a680e985.tar.zst nixlib-bd124ec21a8c49d94821e3ba767e4a46a680e985.zip | |
* Various PAM updates.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14109
Diffstat (limited to 'pkgs/os-specific/linux/pam')
| -rw-r--r-- | pkgs/os-specific/linux/pam/builder.sh | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 18 |
2 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/pam/builder.sh b/pkgs/os-specific/linux/pam/builder.sh deleted file mode 100644 index 531ae2c0b907..000000000000 --- a/pkgs/os-specific/linux/pam/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -export CRACKLIB_DICTPATH=$cracklib/lib - -configureFlags="--enable-includedir=$out/include" - -genericBuild diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 9120a121732c..345211f5226d 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,12 +1,18 @@ {stdenv, fetchurl, cracklib, flex}: stdenv.mkDerivation { - name = "linux-pam-0.99.6.3"; - builder = ./builder.sh; + name = "linux-pam-1.0.3"; + src = fetchurl { - url = mirror://kernel/linux/libs/pam/pre/library/Linux-PAM-0.99.6.3.tar.bz2; - md5 = "4c2830ed55a41e795af6a482009a036c"; + url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.0.3.tar.bz2; + sha256 = "1xqj4ibnid5w3pi629vj7jiddf192kzm8rbm3vy90diqpl1k5h6n"; }; - buildInputs = [flex]; - preConfigure = "configureFlags=\"--includedir=$out/include/security\""; + + buildInputs = [flex cracklib]; + + CRACKLIB_DICTPATH = "${cracklib}/lib"; + + preConfigure = '' + configureFlags="$configureFlags --includedir=$out/include/security" + ''; } |