diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-02-24 21:17:54 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-02-24 21:17:54 +0000 |
| commit | edfe20b2aced91a1e578875dc82848061fb2419c (patch) | |
| tree | 1016f2ab56998c7437b5512017ed681ecf1c9732 /pkgs | |
| parent | 8bf73286a47a405b1ff36ac0095b7c96e9a0f7b6 (diff) | |
| download | nixpkgs-edfe20b2aced91a1e578875dc82848061fb2419c.tar nixpkgs-edfe20b2aced91a1e578875dc82848061fb2419c.tar.gz nixpkgs-edfe20b2aced91a1e578875dc82848061fb2419c.tar.bz2 nixpkgs-edfe20b2aced91a1e578875dc82848061fb2419c.tar.lz nixpkgs-edfe20b2aced91a1e578875dc82848061fb2419c.tar.xz nixpkgs-edfe20b2aced91a1e578875dc82848061fb2419c.tar.zst nixpkgs-edfe20b2aced91a1e578875dc82848061fb2419c.zip | |
Fixes implemented inside kqemu expression
svn path=/nixpkgs/trunk/; revision=14234
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kqemu/1.3.0pre11.nix | 15 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kqemu/1.4.0pre1.nix | 15 |
2 files changed, 26 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix index 54f197f3b5a..d703533aabb 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 7dad06c3d0e..f23418bceea 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 "; |