From 0fb522de9584a1708bbd54ae1fc6a1b5a72c6fdc Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Tue, 25 Oct 2005 17:57:05 +0000 Subject: [PATCH] don't use /bin/ls, but rely on the build environment to supply ls svn path=/nixpkgs/trunk/; revision=4131 --- pkgs/os-specific/linux/pam/default.nix | 2 +- pkgs/os-specific/linux/pam/pam-modules.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/pam/pam-modules.patch diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index fde4eaa7f25..a281452a397 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 00000000000..0153f557203 --- /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