* Added BitTorrent.

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

3 files changed, 38 insertions, 5 deletions

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index ec1116db787b3..84c7ee5c2eda7 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -92,6 +92,10 @@
     inherit fetchurl stdenv;
   };
 
+  bittorrent = (import ../tools/networking/bittorrent) {
+    inherit fetchurl stdenv wxPython;
+  };
+
   graphviz = (import ../tools/graphics/graphviz) {
     inherit fetchurl stdenv libpng libjpeg expat;
     x11 = xfree86;
@@ -231,11 +235,7 @@
   };
 
   python = (import ../development/interpreters/python) {
-    inherit fetchurl stdenv;
-  };
-
-  python = (import ../development/interpreters/python) {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv zlib;
   };
 
   j2re = (import ../development/interpreters/j2re) {
diff --git a/pkgs/tools/networking/bittorrent/builder.sh b/pkgs/tools/networking/bittorrent/builder.sh
new file mode 100755
index 0000000000000..2e643e6f311c0
--- /dev/null
+++ b/pkgs/tools/networking/bittorrent/builder.sh
@@ -0,0 +1,18 @@
+#! /bin/sh -e
+
+buildinputs="$python $wxPython"
+. $stdenv/setup
+
+tar xvfz $src
+cd BitTorrent-*
+python setup.py build install --prefix=$out
+
+mv $out/bin $out/bin-orig
+mkdir $out/bin
+for i in $(cd $out/bin-orig && ls); do
+  cat > $out/bin/$i <<EOF
+#! /bin/sh
+PYTHONPATH=$out/lib/python2.3/site-packages:$wxPython/lib/python2.3/site-packages exec $out/bin-orig/$i \$*
+EOF
+  chmod +x $out/bin/$i
+done
\ No newline at end of file
diff --git a/pkgs/tools/networking/bittorrent/default.nix b/pkgs/tools/networking/bittorrent/default.nix
new file mode 100644
index 0000000000000..feacfbb2ecd72
--- /dev/null
+++ b/pkgs/tools/networking/bittorrent/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, wxPython}:
+
+assert wxPython.python.zlibSupport;
+
+derivation {
+  name = "bittorrent-3.3";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://bitconjurer.org/BitTorrent/BitTorrent-3.3.tar.gz;
+    md5 = "1ecf1fc40b4972470313f9ae728206e8";
+  };
+  python = wxPython.python;
+  inherit stdenv wxPython;
+}