From 07fde1ab815458480ba30d10e7f2af356b959093 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 8 Apr 2011 14:59:29 +0000 Subject: [PATCH] Fix BitTornado svn path=/nixpkgs/trunk/; revision=26757 --- .../networking/p2p/bit-tornado/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/p2p/bit-tornado/default.nix b/pkgs/tools/networking/p2p/bit-tornado/default.nix index 19752082b0e..98c53fdc3a7 100644 --- a/pkgs/tools/networking/p2p/bit-tornado/default.nix +++ b/pkgs/tools/networking/p2p/bit-tornado/default.nix @@ -10,17 +10,12 @@ stdenv.mkDerivation { 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.";