From dcddcf0d879cfb6409ce472469712bc9c05cdf5a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 28 Feb 2008 09:59:34 +0000
Subject: [PATCH] Updated QEmu.
svn path=/nixpkgs/trunk/; revision=10882
---
.../virtualization/qemu/0.9.1.nix | 27 +++++++++++++++++++
pkgs/os-specific/linux/aufs/default.nix | 1 -
pkgs/top-level/all-packages.nix | 3 +--
3 files changed, 28 insertions(+), 3 deletions(-)
create mode 100644 pkgs/applications/virtualization/qemu/0.9.1.nix
diff --git a/pkgs/applications/virtualization/qemu/0.9.1.nix b/pkgs/applications/virtualization/qemu/0.9.1.nix
new file mode 100644
index 000000000000..6fc6f9ec65c0
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/0.9.1.nix
@@ -0,0 +1,27 @@
+args : with args;
+ let localDefs = builderDefs {
+ src = /* put a fetchurl here */
+ fetchurl {
+ url = http://fabrice.bellard.free.fr/qemu/qemu-0.9.1.tar.gz;
+ sha256 = "199mb12w141yh2afzznh539jsip4h79kfsxwaj1xhzfwljsd0mj7";
+ };
+
+ buildInputs = [ SDL zlib which ];
+ configureFlags = [ ];
+ } null; /* null is a terminator for sumArgs */
+ in with localDefs;
+let
+preConfigure = FullDepEntry ("
+ gcc --version
+") [minInit];
+in
+stdenv.mkDerivation rec {
+ name = "qemu-"+version;
+ builder = writeScript (name + "-builder")
+ (textClosure localDefs [ preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
+ meta = {
+ description = "
+ QEmu processor emulator.
+";
+ };
+}
diff --git a/pkgs/os-specific/linux/aufs/default.nix b/pkgs/os-specific/linux/aufs/default.nix
index 2ce510a5b9b8..bc874427f2b3 100644
--- a/pkgs/os-specific/linux/aufs/default.nix
+++ b/pkgs/os-specific/linux/aufs/default.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation {
kernelSource=$(echo $(pwd)/linux-*)
cp -prd $kernelBuild/* $kernelSource
- substituteInPlace fs/aufs/Makefile
make KDIR=$kernelSource -f local.mk
'';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eba7fe3e682b..3708112b13fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5147,9 +5147,8 @@ rec {
python = builtins.getAttr "2.5" python_alts;
};
- qemuFun = lib.sumArgs (selectVersion ../applications/virtualization/qemu "0.9.0") {
+ qemuFun = lib.sumArgs (selectVersion ../applications/virtualization/qemu "0.9.1") {
inherit fetchurl;
- stdenv = overrideGCC stdenv gcc34;
builderDefs = builderDefs {
stdenv = (overrideGCC stdenv gcc34)//{gcc=gcc34;};
};