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

diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix
index 15288361baf..3816df415c6 100644
--- a/pkgs/tools/security/ssss/default.nix
+++ b/pkgs/tools/security/ssss/default.nix
@@ -1,29 +1,26 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz;
-			sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx";
-		};
+{ stdenv, fetchurl, gmp }:
 
-		buildInputs = [gmp];
-		configureFlags = [];
-		doPatch = fullDepEntry (''
-			sed -e s@/usr/@$out/@g -i Makefile
-			cp ssss.manpage.xml ssss.1
-			cp ssss.manpage.xml ssss.1.html
-			ensureDir $out/bin $out/share/man/man1
-			echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
-		'') ["minInit" "doUnpack" "defEnsureDir"];
-	});
-	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "ssss-0.5";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			["doPatch" doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "Shamir Secret Sharing Scheme";
-		inherit src;
-	};
+  name = "ssss-0.5";
+
+  src = fetchurl {
+    url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz;
+    sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx";
+  };
+
+  buildInputs = [ gmp ];
+
+  preBuild =
+    ''
+      sed -e s@/usr/@$out/@g -i Makefile
+      cp ssss.manpage.xml ssss.1
+      cp ssss.manpage.xml ssss.1.html
+      ensureDir $out/bin $out/share/man/man1
+      echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
+    '';
+
+  meta = {
+    description = "Shamir Secret Sharing Scheme";
+    homepage = http://point-at-infinity.org/ssss/;
+  };
 }