* 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, 20 insertions, 26 deletions

diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index f991a387976e..eb7547e628f7 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";
+  };
+}