Author: raskin
Date: Fri Apr  8 14:59:29 2011
New Revision: 26757
URL: https://svn.nixos.org/websvn/nix/?rev=26757&sc=1

Log:
Fix BitTornado

Modified:
   nixpkgs/trunk/pkgs/tools/networking/p2p/bit-tornado/default.nix

Modified: nixpkgs/trunk/pkgs/tools/networking/p2p/bit-tornado/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/p2p/bit-tornado/default.nix     Fri Apr 
 8 14:42:35 2011        (r26756)
+++ nixpkgs/trunk/pkgs/tools/networking/p2p/bit-tornado/default.nix     Fri Apr 
 8 14:59:29 2011        (r26757)
@@ -10,17 +10,12 @@
   buildInputs = [python];
 
   buildPhase = " ";
-  installPhase = "python setup.py install --prefix=$out ;"+
-       " echo 'export 
PYTHONPATH=$PYTHONPATH:'$out'/lib/python2.4/site-packages:"+
-       wxPython26+"/lib/python2.4/site-packages:"+
-       wxPython26+"/lib/python2.6/site-packages:"+
-       "'$out'/lib/python2.5/site-packages:"+
-       "'$out'/lib/python2.6/site-packages:"+
-       wxPython26+"/lib/python2.4/site-packages/wx-2.6-gtk2-unicode:"+
-       wxPython26+"/lib/python2.6/site-packages/wx-2.6-gtk2-unicode:"+
-       wxPython26+"/lib/python2.5/site-packages/wx-2.6-gtk2-unicode; "+
-       "python `which btdownloadgui.py` --ipv6_enabled 1 --ipv6_binds_v4 0 
\"$@\";' >"+
-       "$out/bin/bittornado ; chmod a+rx $out/bin/bittornado;";
+  installPhase = ''
+    python setup.py install --prefix=$out ;
+    echo 'export 
PYTHONPATH=$PYTHONPATH:'$out'/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages/wx-2.6-gtk2-unicode
+    python `which btdownloadgui.py` --ipv6_enabled 1 --ipv6_binds_v4 0 "$@";' 
> $out/bin/bittornado ; 
+    chmod a+rx $out/bin/bittornado;
+  '';
 
   meta = {
     description = "Bittorrent client with IPv6 support.";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to