diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-04-26 09:30:53 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-04-26 09:30:53 +0000 |
| commit | fff97995f369d77a2907dfd9bedb3dea5e297859 (patch) | |
| tree | 3411cea864765fc81251ba18c7d9fe4db9cc5a49 /pkgs/os-specific/linux/pwdutils | |
| parent | a174ff34b8dab7f1a54cbb0223a0dcfe88059c5b (diff) | |
| download | nixlib-fff97995f369d77a2907dfd9bedb3dea5e297859.tar nixlib-fff97995f369d77a2907dfd9bedb3dea5e297859.tar.gz nixlib-fff97995f369d77a2907dfd9bedb3dea5e297859.tar.bz2 nixlib-fff97995f369d77a2907dfd9bedb3dea5e297859.tar.lz nixlib-fff97995f369d77a2907dfd9bedb3dea5e297859.tar.xz nixlib-fff97995f369d77a2907dfd9bedb3dea5e297859.tar.zst nixlib-fff97995f369d77a2907dfd9bedb3dea5e297859.zip | |
pwdutils: Fix compilation with recent glibc.
svn path=/nixpkgs/trunk/; revision=21318
Diffstat (limited to 'pkgs/os-specific/linux/pwdutils')
| -rw-r--r-- | pkgs/os-specific/linux/pwdutils/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pwdutils/sys-stat-h.patch | 37 |
2 files changed, 41 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/pwdutils/default.nix b/pkgs/os-specific/linux/pwdutils/default.nix index 617368fa79ff..6be17ca08127 100644 --- a/pkgs/os-specific/linux/pwdutils/default.nix +++ b/pkgs/os-specific/linux/pwdutils/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ pam gnutls libnscd ]; - patchPhase = + patches = [ ./sys-stat-h.patch ]; + + postPatch = '' for i in src/tst-* do sed -i "$i" -e's|/bin/bash|/bin/sh|g' @@ -38,6 +40,7 @@ stdenv.mkDerivation rec { license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch b/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch new file mode 100644 index 000000000000..5b5bc8440d55 --- /dev/null +++ b/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch @@ -0,0 +1,37 @@ +Fix builds with current glibc git, which appears to be stricter +about <sys/stat.h>. + +--- pwdutils-3.2.6/src/useradd.c~ 2008-10-16 13:46:07.000000000 +0200 ++++ pwdutils-3.2.6/src/useradd.c 2010-04-26 11:24:43.000000000 +0200 +@@ -18,6 +18,7 @@ + #include "config.h" + #endif + ++#include <sys/stat.h> + #include <time.h> + #include <utmp.h> + #include <fcntl.h> + +--- pwdutils-3.2.6/src/userdel.c~ 2006-11-29 14:20:39.000000000 +0100 ++++ pwdutils-3.2.6/src/userdel.c 2010-04-26 11:26:08.000000000 +0200 +@@ -18,6 +18,7 @@ + #include "config.h" + #endif + ++#include <sys/stat.h> + #include <time.h> + #include <utmp.h> + #include <fcntl.h> + +diff -ubB --show-c-function pwdutils-3.2.6/src/usermod.c\~ pwdutils-3.2.6/src/usermod.c +--- pwdutils-3.2.6/src/usermod.c~ 2006-11-29 14:20:41.000000000 +0100 ++++ pwdutils-3.2.6/src/usermod.c 2010-04-26 11:27:41.000000000 +0200 +@@ -18,6 +18,7 @@ + #include "config.h" + #endif + ++#include <sys/stat.h> + #include <time.h> + #include <utmp.h> + #include <fcntl.h> + |