From 1fa791a24357371b4c9f57f6cb63a8cbbfaf0dfe Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Thu, 13 Aug 2015 04:04:40 +0200
Subject: [PATCH] libtorrent-rasterbar: 0.16.17 -> 0.16.19 + 1.0.2 -> 1.0.6

---
 .../libraries/libtorrent-rasterbar/0.16.nix        |  4 ++--
 .../libraries/libtorrent-rasterbar/default.nix     |  4 ++--
 .../libraries/libtorrent-rasterbar/generic.nix     | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix
index 6298f2f0c0f..985c570a34e 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "0.16.17";
-  sha256 = "1w5gcizd6jlvzwgy0307az856h0cly685yf275p1v6bdcafd58b7";
+  version = "0.16.19";
+  sha256 = "1nlrivhnshn4wd9m5dsbjmq84731z9f9glj5q3vxz0c01s1lv7vw";
 })
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index e1f1fc179d6..725b98cdae6 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.0.2";
-  sha256 = "1ph4cb6nrk2hiy89j3kz1wj16ph0b9yixrf4f4935rnzhha8x31w";
+  version = "1.0.6";
+  sha256 = "1qypc5lx82vlqm9016knxx8khxpc9dy78a0q2x5jmxjk8v6g994r";
 })
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
index b866f66dbfa..a5bb258af1a 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
@@ -1,18 +1,26 @@
-{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconv, geoip
+{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip
 # Version specific options
 , version, sha256
 , ... }:
 
+let formattedVersion = lib.replaceChars ["."] ["_"] version;
+
+in
+
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
   
   src = fetchurl {
-    url = "mirror://sourceforge/libtorrent/${name}.tar.gz";
+    url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz";
     inherit sha256;
   };
 
+  nativeBuildInputs = [automake autoconf libtool ];
+
   buildInputs = [ boost pkgconfig openssl zlib python libiconv geoip ];
 
+  preConfigure = "./autotool.sh";
+
   configureFlags = [ 
     "--enable-python-binding"
     "--with-libgeoip=system"
@@ -21,6 +29,8 @@ stdenv.mkDerivation rec {
     "--with-boost-libdir=${boost.lib}/lib"
     "--with-libiconv=yes"
   ];
+
+  enableParallelBuilding = true;
   
   meta = with stdenv.lib; {
     homepage = http://www.rasterbar.com/products/libtorrent/;