* 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

pkgs/tools/system/gdmap/default.nix

@@ -1,21 +1,16 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-		    url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz;
-		    sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
-		};
+{ stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }:
 
-		buildInputs = [gtk pkgconfig libxml2 intltool gettext];
-		configureFlags = [];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "gdmap-0.8.1";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "Recursive rectangle map of disk usage";
-		inherit src;
-	};
+stdenv.mkDerivation {
+  name = "gdmap-0.8.1";
+  
+  src = fetchurl {
+    url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz;
+    sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
+  };
+
+  buildInputs = [ gtk pkgconfig libxml2 intltool gettext ];
+
+  meta = {
+    description = "Recursive rectangle map of disk usage";
+  };
 }