From edfe20b2aced91a1e578875dc82848061fb2419c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 24 Feb 2009 21:17:54 +0000
Subject: Fixes implemented inside kqemu expression

svn path=/nixpkgs/trunk/; revision=14234
---
 pkgs/os-specific/linux/kqemu/1.3.0pre11.nix | 15 +++++++++++++--
 pkgs/os-specific/linux/kqemu/1.4.0pre1.nix  | 15 +++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

(limited to 'pkgs/os-specific/linux/kqemu')

diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
index 54f197f3b5a2..d703533aabb3 100644
--- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
+++ b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
@@ -18,8 +18,19 @@ 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 ";
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 ";
-- 
cgit 1.4.1