diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-29 09:58:53 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-29 09:58:53 +0000 |
| commit | 94324d95b39ff04dd5cf0f4d0eb0c36ce7c6eaf6 (patch) | |
| tree | 3bbdb564c758cdce8e31163b544a4168425f989c /pkgs/os-specific/linux/procps | |
| parent | 0fa35eee66e86feebaec017c28db5ce06fa7b3a5 (diff) | |
| download | nixpkgs-94324d95b39ff04dd5cf0f4d0eb0c36ce7c6eaf6.tar nixpkgs-94324d95b39ff04dd5cf0f4d0eb0c36ce7c6eaf6.tar.gz nixpkgs-94324d95b39ff04dd5cf0f4d0eb0c36ce7c6eaf6.tar.bz2 nixpkgs-94324d95b39ff04dd5cf0f4d0eb0c36ce7c6eaf6.tar.lz nixpkgs-94324d95b39ff04dd5cf0f4d0eb0c36ce7c6eaf6.tar.xz nixpkgs-94324d95b39ff04dd5cf0f4d0eb0c36ce7c6eaf6.tar.zst nixpkgs-94324d95b39ff04dd5cf0f4d0eb0c36ce7c6eaf6.zip | |
Fix to make procps build with gnumake 3.82
svn path=/nixpkgs/branches/stdenv-updates/; revision=23492
Diffstat (limited to 'pkgs/os-specific/linux/procps')
| -rw-r--r-- | pkgs/os-specific/linux/procps/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/procps/gnumake3.82.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix index 4a74218aa36..9270e4c6c0e 100644 --- a/pkgs/os-specific/linux/procps/default.nix +++ b/pkgs/os-specific/linux/procps/default.nix @@ -7,6 +7,6 @@ stdenv.mkDerivation { url = http://procps.sourceforge.net/procps-3.2.8.tar.gz; sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i"; }; - patches = [./makefile.patch ./procps-build.patch]; + patches = [./makefile.patch ./procps-build.patch ./gnumake3.82.patch]; buildInputs = [ncurses]; } diff --git a/pkgs/os-specific/linux/procps/gnumake3.82.patch b/pkgs/os-specific/linux/procps/gnumake3.82.patch new file mode 100644 index 00000000000..2b1f28d4bce --- /dev/null +++ b/pkgs/os-specific/linux/procps/gnumake3.82.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 09fb3ed..59eba16 100644 +--- a/Makefile ++++ b/Makefile +@@ -174,7 +174,7 @@ INSTALL := $(BINFILES) $(MANFILES) + # want this rule first, use := on ALL, and ALL not filled in yet + all: do_all + +--include */module.mk ++-include proc/module.mk ps/module.mk + + do_all: $(ALL) + |