From 2eb54f5062f171fbb686b900fbb347dcfe8958a2 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 27 Feb 2012 22:53:44 +0000
Subject: [PATCH] fix bittorrent by using buildPythonPackage

svn path=/nixpkgs/branches/stdenv-updates/; revision=32636
---
 .../networking/p2p/bittorrent/builder.sh      | 27 -------------------
 .../networking/p2p/bittorrent/default.nix     | 13 ++++++---
 2 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/tools/networking/p2p/bittorrent/builder.sh

diff --git a/pkgs/tools/networking/p2p/bittorrent/builder.sh b/pkgs/tools/networking/p2p/bittorrent/builder.sh
deleted file mode 100644
index 3f30aa5c851..00000000000
--- a/pkgs/tools/networking/p2p/bittorrent/builder.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-source $stdenv/setup
-
-
-# Workaround for:
-#  File "...-python-2.4.4/lib/python2.4/posixpath.py", line 62, in join
-#    elif path == '' or path.endswith('/'):
-# AttributeError: 'NoneType' object has no attribute 'endswith'
-export HOME=$TMP
-
-
-buildPhase() {
-    python setup.py build
-}
-
-
-installPhase() {
-    python setup.py install --prefix=$out
-
-    # Create wrappers that set the environment correctly.
-    for i in $(cd $out/bin && ls); do
-        wrapProgram $out/bin/$i \
-            --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
-    done
-}
-
-
-genericBuild
diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix
index 1d4f43445bf..42d4236ecc1 100644
--- a/pkgs/tools/networking/p2p/bittorrent/default.nix
+++ b/pkgs/tools/networking/p2p/bittorrent/default.nix
@@ -1,20 +1,25 @@
 { gui ? false
 , stdenv, fetchurl, makeWrapper
-, python, wxPython ? null, pycrypto, twisted
+, python, wxPython ? null, pycrypto, twisted, buildPythonPackage
 }:
 
 assert gui -> wxPython != null;
 
-stdenv.mkDerivation {
+buildPythonPackage rec {
   name = "bittorrent-5.2.2";
   
-  builder = ./builder.sh;
-  
   src = fetchurl {
     url = http://download.bittorrent.com/dl/archive/BitTorrent-5.2.2.tar.gz;
     sha256 = "05k803hbwsyn51j4aibzdsnqxz24kw4rvr60v2c0wji8gcvy3kx9";
   };
   
+  preConfigure = ''
+    export HOME=$TMP
+  '';
+
+  # accesses network
+  doCheck = false;
+
   buildInputs = [ python pycrypto twisted makeWrapper ]
     ++ stdenv.lib.optional gui wxPython;