JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add fix for braindead module.h, so it can compile with our glibc kernel headers

Browse Source 
svn path=/nixpkgs/trunk/; revision=3953
This commit is contained in:
Armijn Hemel 2005-09-28 14:06:10 +00:00
parent d217b912d2
commit b9a0811148
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/sysklogd/builder.sh
View File

@ -7,4 +7,6 @@ ensureDir "$out/usr/share/man/man8/"
ensureDir "$out/usr/share/man/man5/"
ensureDir "$out/usr/sbin"
NIX_CFLAGS_COMPILE="-DCONFIG_X86_L1_CACHE_SHIFT=0 $NIX_CFLAGS_COMPILE"
genericBuild

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

@ -7,5 +7,5 @@ stdenv.mkDerivation {
url = http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.4.1.tar.gz;
md5 = "d214aa40beabf7bdb0c9b3c64432c774";
};
patches = [./sysklogd-1.4.1-cvs-20050525.diff];
patches = [./sysklogd-1.4.1-cvs-20050525.diff ./sysklogd-1.4.1-asm.patch];
}

12
pkgs/os-specific/linux/sysklogd/sysklogd-1.4.1-asm.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN sysklogd-1.4.1/module.h sysklogd-1.4.1.new/module.h
--- sysklogd-1.4.1/module.h 2005-09-28 15:53:58.000000000 +0200
+++ sysklogd-1.4.1.new/module.h 2005-09-28 15:54:56.000000000 +0200
@@ -28,7 +28,7 @@
* recent content from Linux 2.4/2.6.
*/
-#include <asm/atomic.h>
+/* #include <asm/atomic.h> */
#define MODULE_NAME_LEN 60