ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Fix to make procps build with gnumake 3.82

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23492
This commit is contained in:
Lluís Batlle i Rossell 2010-08-29 09:58:53 +00:00
parent 0fa35eee66
commit 94324d95b3
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/procps/default.nix
View File

@ -7,6 +7,6 @@ stdenv.mkDerivation {
url = http://procps.sourceforge.net/procps-3.2.8.tar.gz; url = http://procps.sourceforge.net/procps-3.2.8.tar.gz;
sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i"; sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i";
}; };
patches = [./makefile.patch ./procps-build.patch]; patches = [./makefile.patch ./procps-build.patch ./gnumake3.82.patch];
buildInputs = [ncurses]; buildInputs = [ncurses];
} }

13
pkgs/os-specific/linux/procps/gnumake3.82.patch Normal file
View File

@ -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)