Merge pull request #42409 from Chiiruno/dev/libtorrent

libtorrentRasterbar: fix build, restructure
This commit is contained in:
Andreas Rammhold 2018-06-24 10:53:45 +02:00 committed by GitHub
commit 7bf378ce7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 { let
name = "libtorrent-rasterbar-${version}";
version = "1.1.7"; version = "1.1.7";
formattedVersion = lib.replaceChars ["."] ["_"] version;
in stdenv.mkDerivation {
name = "libtorrent-rasterbar-${version}";
src = src = fetchFromGitHub {
let formattedVersion = lib.replaceChars ["."] ["_"] version; owner = "arvidn";
in fetchurl { repo = "libtorrent";
url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz"; rev = "libtorrent-${formattedVersion}";
sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc"; sha256 = "073nb7yca5jg1i8z5h76qrmddl2hdy8fc1pnchkg574087an31r3";
}; };
patches = [ patches = [
(fetchpatch { (fetchpatch {
url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch"; url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch";
sha256 = "0d4h0g129rsgm8xikybxypgv6nnya7ap7kskl7q78p4h6y2a0fhc"; sha256 = "1bdv0icqzbg1il60sckcly4y22lkdbkkwdjadwdzxv7cdj586bzd";
}) })
]; (fetchpatch {
url = "https://github.com/arvidn/libtorrent/commit/9cd0ae67e74a507c1b9ff9c057ee97dda38ccb81.patch";
sha256 = "1cscqpc6fq9iwspww930dsxf0yb01bgrghzf5hdhl09a87r6q2zg";
})
];
enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boost openssl zlib python libiconv geoip ]; buildInputs = [ boost openssl zlib python libiconv geoip ];
preConfigure = "./autotool.sh"; preConfigure = "./autotool.sh";
configureFlags = [ configureFlags = [
@ -32,12 +39,8 @@ patches = [
"--with-libiconv=yes" "--with-libiconv=yes"
]; ];
enableParallelBuilding = true;
doCheck = false; # fails to link
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.rasterbar.com/products/libtorrent/; homepage = "https://libtorrent.org/";
description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.phreedom ]; maintainers = [ maintainers.phreedom ];