Updated QEmu.

svn path=/nixpkgs/trunk/; revision=10882

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.
+";
+	};
+}

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
   '';
 

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;};
     };