From b9a0811148f5b883956f086ab2dd0cf23ae56eb5 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 28 Sep 2005 14:06:10 +0000
Subject: [PATCH] add fix for braindead module.h, so it can compile with our
 glibc kernel headers

svn path=/nixpkgs/trunk/; revision=3953
---
 pkgs/os-specific/linux/sysklogd/builder.sh           |  2 ++
 pkgs/os-specific/linux/sysklogd/default.nix          |  2 +-
 .../linux/sysklogd/sysklogd-1.4.1-asm.patch          | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/sysklogd/sysklogd-1.4.1-asm.patch

diff --git a/pkgs/os-specific/linux/sysklogd/builder.sh b/pkgs/os-specific/linux/sysklogd/builder.sh
index d7635547b686..7c6e804c0d2c 100644
--- a/pkgs/os-specific/linux/sysklogd/builder.sh
+++ b/pkgs/os-specific/linux/sysklogd/builder.sh
@@ -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
diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix
index c4432801438f..ee9efc72ce82 100644
--- a/pkgs/os-specific/linux/sysklogd/default.nix
+++ b/pkgs/os-specific/linux/sysklogd/default.nix
@@ -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];
 }
diff --git a/pkgs/os-specific/linux/sysklogd/sysklogd-1.4.1-asm.patch b/pkgs/os-specific/linux/sysklogd/sysklogd-1.4.1-asm.patch
new file mode 100644
index 000000000000..a66bf70542b5
--- /dev/null
+++ b/pkgs/os-specific/linux/sysklogd/sysklogd-1.4.1-asm.patch
@@ -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
+