diff options
author | Okina Matara <okinan@chiru.no> | 2018-06-22 20:35:37 -0500 |
---|---|---|
committer | Okina Matara <okinan@chiru.no> | 2018-06-23 00:55:37 -0500 |
commit | 48aa44ea84c0a5cee1700c21e9a832e519b0a065 (patch) | |
tree | fc16347d97afbb476d0ab86de46a237241be562f /pkgs/development/libraries/libtorrent-rasterbar | |
parent | 9c0ebbe7a36d7296e81d97c85cba35aee7bd8334 (diff) | |
download | nixlib-48aa44ea84c0a5cee1700c21e9a832e519b0a065.tar nixlib-48aa44ea84c0a5cee1700c21e9a832e519b0a065.tar.gz nixlib-48aa44ea84c0a5cee1700c21e9a832e519b0a065.tar.bz2 nixlib-48aa44ea84c0a5cee1700c21e9a832e519b0a065.tar.lz nixlib-48aa44ea84c0a5cee1700c21e9a832e519b0a065.tar.xz nixlib-48aa44ea84c0a5cee1700c21e9a832e519b0a065.tar.zst nixlib-48aa44ea84c0a5cee1700c21e9a832e519b0a065.zip |
libtorrentRasterbar: fix build, restructure
Diffstat (limited to 'pkgs/development/libraries/libtorrent-rasterbar')
-rw-r--r-- | pkgs/development/libraries/libtorrent-rasterbar/default.nix | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 5323b757b2bc..0ef2802aec1d 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,26 +1,33 @@ -{ stdenv, fetchurl, fetchpatch, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf, zlib +, boost, openssl, libtool, python, libiconv, geoip }: -stdenv.mkDerivation rec { - name = "libtorrent-rasterbar-${version}"; +let version = "1.1.7"; + formattedVersion = lib.replaceChars ["."] ["_"] version; +in stdenv.mkDerivation { + name = "libtorrent-rasterbar-${version}"; - src = - let formattedVersion = lib.replaceChars ["."] ["_"] version; - in fetchurl { - url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz"; - sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc"; - }; + src = fetchFromGitHub { + owner = "arvidn"; + repo = "libtorrent"; + rev = "libtorrent-${formattedVersion}"; + sha256 = "073nb7yca5jg1i8z5h76qrmddl2hdy8fc1pnchkg574087an31r3"; + }; -patches = [ - (fetchpatch { - url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch"; - sha256 = "0d4h0g129rsgm8xikybxypgv6nnya7ap7kskl7q78p4h6y2a0fhc"; - }) -]; + patches = [ + (fetchpatch { + url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch"; + sha256 = "1bdv0icqzbg1il60sckcly4y22lkdbkkwdjadwdzxv7cdj586bzd"; + }) + (fetchpatch { + url = "https://github.com/arvidn/libtorrent/commit/9cd0ae67e74a507c1b9ff9c057ee97dda38ccb81.patch"; + sha256 = "1cscqpc6fq9iwspww930dsxf0yb01bgrghzf5hdhl09a87r6q2zg"; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boost openssl zlib python libiconv geoip ]; - preConfigure = "./autotool.sh"; configureFlags = [ @@ -32,12 +39,8 @@ patches = [ "--with-libiconv=yes" ]; - enableParallelBuilding = true; - - doCheck = false; # fails to link - meta = with stdenv.lib; { - homepage = http://www.rasterbar.com/products/libtorrent/; + homepage = "http://www.rasterbar.com/products/libtorrent"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ maintainers.phreedom ]; |