From 962f68f39029b5f961a1aa0af64e5b8e5368db1a Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Sat, 11 Jul 2015 15:09:46 -0700
Subject: [PATCH] tribler: 5.5.x-25411 -> 6.4.3

---
 .../networking/p2p/tribler/default.nix        | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 5bc228f9a6b..fed8f8ad31f 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,33 +1,44 @@
-{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools
+{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar
 , enablePlayer ? false, vlc ? null }:
 
-let rev = "25411"; in
 
-stdenv.mkDerivation {
-  name = "tribler-5.5.21-pre${rev}";
+stdenv.mkDerivation rec {
+  name = "tribler-${version}";
+  version = "v6.4.3";
 
-  src = fetchsvn {
-    url = http://svn.tribler.org/abc/branches/release-5.5.x;
-    inherit rev;
-    sha256 = "17c9svy4zjchzihk6mf0kh4lnvaxjfmgfmimyby5w0d3cwbw49zx";
+  src = fetchurl {
+    url = "https://github.com/Tribler/tribler/releases/download/${version}/Tribler-${version}.tar.xz";
+    sha256 = "1n5qi3jlby41w60zg6dvl933ypyiflq3rb0qkwhxi4b26s3vwvgr";
   };
 
-  buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];
+  buildInputs = [
+    pythonPackages.python
+    pythonPackages.wrapPython
+    makeWrapper
+  ];
 
-  pythonPath =
-    [ pythonPackages.wxPython pythonPackages.curses pythonPackages.apsw
-      pythonPackages.setuptools pythonPackages.m2crypto pythonPackages.sqlite3
-    ];
+  pythonPath = [
+    libtorrentRasterbar
+    pythonPackages.wxPython
+    pythonPackages.curses
+    pythonPackages.apsw
+    pythonPackages.twisted
+    pythonPackages.gmpy
+    pythonPackages.netifaces
+    pythonPackages.pil
+    pythonPackages.pycrypto
+    pythonPackages.pyasn1
+    pythonPackages.requests
+    pythonPackages.setuptools
+    pythonPackages.m2crypto
+    pythonPackages.sqlite3
+  ];
 
   installPhase =
     ''
-      substituteInPlace Tribler/Core/NATFirewall/guessip.py \
-          --replace /bin/netstat ${nettools}/bin/netstat \
-          --replace /sbin/ifconfig ${nettools}/sbin/ifconfig
-    
       # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
       wrapPythonPrograms
-      
+
       mkdir -p $out/share/tribler
       cp -prvd Tribler $out/share/tribler/