* 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/applications/graphics/xfig/builder.sh

@@ -1,5 +1,4 @@
 source $stdenv/setup
-source $makeWrapper
 
 makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man"
 
@@ -16,9 +15,7 @@ installCommand=myInstall
 myInstall() {
     make install.all $makeFlags
 
-    mv $out/bin/xfig $out/bin/.xfig
-
-    makeWrapper $out/bin/.xfig $out/bin/xfig \
+    wrapProgram $out/bin/xfig \
         --set XAPPLRESDIR $out/etc/X11/app-defaults
 }
 

pkgs/applications/graphics/xfig/default.nix

@@ -11,9 +11,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
 
-  buildInputs = [imake x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg];
-
-  inherit makeWrapper;
+  buildInputs = [imake x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg makeWrapper];
 
   NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11";