* 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

4 files changed, 65 insertions, 81 deletions

diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix
index 69296a45c2490..32050ac5c28f9 100644
--- a/pkgs/data/fonts/clearlyU/default.nix
+++ b/pkgs/data/fonts/clearlyU/default.nix
@@ -1,29 +1,25 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://crl.nmsu.edu/~mleisher/cu/cu12-1.9.tar.gz;
-			sha256 = "0256h6f3ky529jc39hh0nvkngy48a0x3gss2z81g5ddi1qzfw0pn";
-		};
-		buildInputs = [mkfontdir mkfontscale];
-		configureFlags = [];
-		doInstall = fullDepEntry (''
-			tar xf ${src}
-			ensureDir $out/share/fonts/
-			cp *.bdf $out/share/fonts
-			cd $out/share/fonts
-			mkfontdir 
-			mkfontscale
-		'') ["minInit" "defEnsureDir" "addInputs"];
-	});
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "clearlyU-12-1.9";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doInstall doForceShare doPropagate]);
-	meta = {
-		description = "A Unicode font";
-		inherit src;
-	};
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+
+stdenv.mkDerivation {
+  name = "clearlyU-12-1.9";
+
+  src = fetchurl {
+    url = http://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz;
+    sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
+  };
+  
+  buildInputs = [ mkfontdir mkfontscale ];
+
+  installPhase =
+    ''
+      ensureDir $out/share/fonts
+      cp *.bdf $out/share/fonts
+      cd $out/share/fonts
+      mkfontdir 
+      mkfontscale
+    '';
+
+  meta = {
+    description = "A Unicode font";
+  };
 }
diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index f991a387976e9..eb7547e628f7d 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -1,30 +1,24 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-		  url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip;
-		  sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns";
-		};
+{ stdenv, fetchurl, unzip }:
 
-		buildInputs = [unzip];
-		configureFlags = [];
-		doInstall = fullDepEntry (''
-			unzip ${src}
-			ensureDir $out/share/fonts/junicode-ttf
-			cp *.ttf $out/share/fonts/junicode-ttf
-		'') ["minInit" "addInputs" "defEnsureDir"];
-	});
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "junicode-0.6.15";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doInstall doForceShare doPropagate]);
-	meta = {
-		description = "A Unicode font";
-		inherit src;
-	};
-}
+stdenv.mkDerivation {
+  name = "junicode-0.6.15";
+
+  src = fetchurl {
+    url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip;
+    sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns";
+  };
 
+  buildInputs = [ unzip ];
 
+  sourceRoot = ".";
 
+  installPhase =
+    ''
+      ensureDir $out/share/fonts/junicode-ttf
+      cp *.ttf $out/share/fonts/junicode-ttf
+    '';
+
+  meta = {
+    description = "A Unicode font";
+  };
+}
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
new file mode 100644
index 0000000000000..ba38d8dc1abbb
--- /dev/null
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "wqy-zenhei-0.4.23-1";
+
+  src = fetchurl {
+    url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz;
+    sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm";
+  };
+
+  installPhase =
+    ''
+      ensureDir $out/share/fonts
+      cp *.ttf $out/share/fonts
+    '';
+
+  meta = {
+    description = "A (mainly) Chinese Unicode font";
+  };
+}
+
diff --git a/pkgs/data/fonts/wqy_zenhei/default.nix b/pkgs/data/fonts/wqy_zenhei/default.nix
deleted file mode 100644
index 4b6120ad10836..0000000000000
--- a/pkgs/data/fonts/wqy_zenhei/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz;
-			sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm";
-		};
-
-		buildInputs = [];
-		configureFlags = [];
-		doInstall = fullDepEntry (''
-			ensureDir $out/share/fonts
-			cp *.ttf $out/share/fonts
-		'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
-	});
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "wqy-zenhei-0.4.23-1";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doInstall doForceShare doPropagate]);
-	meta = {
-		description = "A (mainly) Chinese Unicode font";
-		inherit src;
-	};
-}
-