* ltrace: updated to 0.5.3.

* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

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

1 files changed, 19 insertions, 23 deletions

diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
index c65105e4796..a3d21ab1800 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -1,26 +1,22 @@
+{ stdenv, fetchurl, xorg }:
 
-args : with args; with builderDefs.passthru.function {src="";};
-	let localDefs = builderDefs.passthru.function ((rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;
-			sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
-		};
-
-		buildInputs = [libX11 xproto xextproto libXext libXrandr randrproto];
-		doCreatePrefix = fullDepEntry (''
-			ensureDir $out
-		'') ["defEnsureDir"];
-		configureFlags = [];
-	}) // args); /* null is a terminator for sumArgs */
-	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "x2vnc-1.7.2";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doConfigure doCreatePrefix doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "A program to control a remote VNC server";
-		inherit src;
-	};
+  name = "x2vnc-1.7.2";
+
+  src = fetchurl {
+    url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;
+    sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
+  };
+
+  buildInputs =
+    [ xorg.libX11 xorg.xproto xorg.xextproto xorg.libXext
+      xorg.libXrandr xorg.randrproto
+    ];
+
+  preInstall = "ensureDir $out";
+
+  meta = {
+    homepahe = http://fredrik.hubbe.net/x2vnc.html;
+    description = "A program to control a remote VNC server";
+  };
 }