* 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/applications/graphics/gocr/default.nix

@@ -1,21 +1,14 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-fetchurl {
-		url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
-		sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
-	};
+{ stdenv, fetchurl }:
 
-		buildInputs = [];
-		configureFlags = [];
-	};
-	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "gocr";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "GPL Optical Character Recognition";
-		inherit src;
-	};
+  name = "gocr-0.44";
+
+  src = fetchurl {
+    url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
+    sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
+  };
+
+  meta = {
+    description = "GPL Optical Character Recognition";
+  };
 }