diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-25 17:57:05 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-25 17:57:05 +0000 |
| commit | 0fb522de9584a1708bbd54ae1fc6a1b5a72c6fdc (patch) | |
| tree | e00b5bff345b7fdedf79268e6cbc40d5947cf459 /pkgs/os-specific/linux/pam | |
| parent | c82afd131d1bb1f4ca6a95162897a8ddf0579291 (diff) | |
| download | nixlib-0fb522de9584a1708bbd54ae1fc6a1b5a72c6fdc.tar nixlib-0fb522de9584a1708bbd54ae1fc6a1b5a72c6fdc.tar.gz nixlib-0fb522de9584a1708bbd54ae1fc6a1b5a72c6fdc.tar.bz2 nixlib-0fb522de9584a1708bbd54ae1fc6a1b5a72c6fdc.tar.lz nixlib-0fb522de9584a1708bbd54ae1fc6a1b5a72c6fdc.tar.xz nixlib-0fb522de9584a1708bbd54ae1fc6a1b5a72c6fdc.tar.zst nixlib-0fb522de9584a1708bbd54ae1fc6a1b5a72c6fdc.zip | |
don't use /bin/ls, but rely on the build environment to supply ls
svn path=/nixpkgs/trunk/; revision=4131
Diffstat (limited to 'pkgs/os-specific/linux/pam')
| -rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam/pam-modules.patch | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index fde4eaa7f258..a281452a397e 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -7,6 +7,6 @@ stdenv.mkDerivation { url = http://www.nl.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-0.80.tar.bz2; md5 = "ccff87fe639efdfc22b1ba4a0f08ec57"; }; - patches = [./pam-pwd.patch ./pam-cracklib.patch]; + patches = [./pam-pwd.patch ./pam-cracklib.patch ./pam-modules.patch]; inherit cracklib; } diff --git a/pkgs/os-specific/linux/pam/pam-modules.patch b/pkgs/os-specific/linux/pam/pam-modules.patch new file mode 100644 index 000000000000..0153f5572039 --- /dev/null +++ b/pkgs/os-specific/linux/pam/pam-modules.patch @@ -0,0 +1,12 @@ +diff -ruN Linux-PAM-0.80/modules/Makefile Linux-PAM-0.80.new/modules/Makefile +--- Linux-PAM-0.80/modules/Makefile 2004-09-28 15:49:21.000000000 +0200 ++++ Linux-PAM-0.80.new/modules/Makefile 2005-10-25 19:54:12.000000000 +0200 +@@ -8,7 +8,7 @@ + + include ../Make.Rules + +-MODDIRS=$(shell /bin/ls -d pam_*/Makefile | cut -f1 -d/) ++MODDIRS=$(shell ls -d pam_*/Makefile | cut -f1 -d/) + + all: + @echo building the static modutil library |