* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14557

2 files changed, 27 insertions, 5 deletions

diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
index 54f197f3b5a2..d2f26cab8a37 100644
--- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
+++ b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
@@ -18,10 +18,21 @@ rec {
     cat install.sh
     sed -e '/linux\/ioctl.h/a#include <linux\/sched.h>' -i kqemu-linux.c
   '') ["minInit" "doUnpack"];
-
-  phaseNames = ["preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
+  fixInc = {
+    text = ''
+      sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
+    '';
+    deps = ["minInit" "doUnpack"];
+  };
+  fixMemFunc = {
+    text=''
+      sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
+    '';
+    deps = ["minInit" "doUnpack"];
+  };
+  phaseNames = ["fixInc" "fixMemFunc" "preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
 
   meta = {
-    description = " Kernel module for Qemu acceleration ";
+    description = "Kernel module for Qemu acceleration";
   }; 
 }
diff --git a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
index 7dad06c3d0e6..f23418bceea6 100644
--- a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
+++ b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
@@ -17,8 +17,19 @@ rec {
     sed -e '/depmod/d' -i install.sh
     cat install.sh
   '') ["minInit" "doUnpack"];
-
-  phaseNames = ["preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
+  fixInc = {
+    text = ''
+      sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
+    '';
+    deps = ["minInit" "doUnpack"];
+  };
+  fixMemFunc = {
+    text=''
+      sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
+    '';
+    deps = ["minInit" "doUnpack"];
+  };
+  phaseNames = ["fixInc" "fixMemFunc" "preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
 
   meta = {
     description = " Kernel module for Qemu acceleration ";