* makeWrapper: option --run <CMD> to run a command from the wrapper.

This is so that the Unison wrapper can be generated with
  makeWrapper.
* Use makeWrapper as a buildInput everywhere.
* Updated BitTorrent, cvs2svn.

svn path=/nixpkgs/trunk/; revision=10213

pkgs/misc/trac/builder.sh

@@ -1,5 +1,4 @@
 source $stdenv/setup
-source $makeWrapper
 
 unpackPhase
 mkdir -p $out
@@ -7,7 +6,6 @@ cd $name
 $python/bin/python setup.py install --prefix=$out
 
 for i in $(cd $out/bin && ls); do
-	mv $out/bin/$i $out/bin/.orig-$i
-	makeWrapper $out/bin/.orig-$i $out/bin/$i \
-		--set PYTHONPATH "$python/site-packages:$out/lib/python2.4/site-packages:$pysqlite/lib/python2.4/site-packages:$subversion/lib/svn-python:$clearsilver/site-packages"
+    wrapProgram $out/bin/$i \
+        --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $pysqlite):$subversion/lib/svn-python:$clearsilver/site-packages"
 done

pkgs/misc/trac/default.nix

@@ -3,13 +3,12 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-	name = "trac-0.9.5";
-	src = fetchurl {
-		url = "http://ftp.edgewall.com/pub/trac/trac-0.9.5.tar.gz";
-		md5 = "3b7d708eaf905cc6ba2b6b10a09a8cf4";
-	};
-	builder = ./builder.sh;
-	inherit stdenv python subversion clearsilver sqlite pysqlite makeWrapper;
+  name = "trac-0.9.5";
+  src = fetchurl {
+    url = "http://ftp.edgewall.com/pub/trac/trac-0.9.5.tar.gz";
+    md5 = "3b7d708eaf905cc6ba2b6b10a09a8cf4";
+  };
+  builder = ./builder.sh;
+  buildInputs = [makeWrapper];
+  inherit stdenv python subversion clearsilver sqlite pysqlite;
 }
-
-