* Qemu: apply the Samba patch from KVM.

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

3 files changed, 21 insertions, 62 deletions

diff --git a/pkgs/applications/virtualization/qemu/0.9.0.nix b/pkgs/applications/virtualization/qemu/0.9.0.nix
deleted file mode 100644
index db49632f9041b..0000000000000
--- a/pkgs/applications/virtualization/qemu/0.9.0.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-args : with args;
-	let localDefs = builderDefs {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://fabrice.bellard.free.fr/qemu/qemu-0.9.0.tar.gz;
-			sha256 = "1h85njd8xvn472yhcm92rjyzqjr719ab73rxwmz9cm2n6gwsq7s9";
-		};
-
-		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.
-";
-		inherit src;
-	};
-}
diff --git a/pkgs/applications/virtualization/qemu/0.9.1.nix b/pkgs/applications/virtualization/qemu/0.9.1.nix
index 1d1774a5c7bd8..bb5ad173c0a10 100644
--- a/pkgs/applications/virtualization/qemu/0.9.1.nix
+++ b/pkgs/applications/virtualization/qemu/0.9.1.nix
@@ -1,28 +1,20 @@
-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";
-		};
+{stdenv, fetchurl, SDL, zlib, which}:
 
-		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.
-";
-		inherit src;
-	};
+stdenv.mkDerivation {
+  name = "qemu-0.9.1";
+
+  src = fetchurl {
+    url = http://bellard.org/qemu/qemu-0.9.1.tar.gz;
+    sha256 = "199mb12w141yh2afzznh539jsip4h79kfsxwaj1xhzfwljsd0mj7";
+  };
+
+  patches = [../../../os-specific/linux/kvm/smbd-path.patch];
+
+  patchFlags = "-p2";
+  
+  buildInputs = [SDL zlib which];
+  
+  meta = {
+    description = "QEmu processor emulator";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 242f2e342e715..ab06492a4bf55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6188,16 +6188,11 @@ let pkgs = rec {
     python = python25;
   };
 
-  qemuFun = lib.sumArgs (selectVersion ../applications/virtualization/qemu "0.9.1") {
-    inherit fetchurl;
-    builderDefs = builderDefs {
-      stdenv = (overrideGCC stdenv gcc34)//{gcc=gcc34;};
-    };
-    inherit SDL zlib which;
+  qemu = import ../applications/virtualization/qemu/0.9.1.nix {
+    inherit fetchurl SDL zlib which;
+    stdenv = overrideGCC stdenv gcc34;
   };
 
-  qemu = qemuFun null;
-
   qemuImageFun = lib.sumArgs 
     (selectVersion ../applications/virtualization/qemu/linux-img "0.2") {
     inherit builderDefs fetchurl stdenv;