Merge pull request #125014 from winterqt/bump-rtorrent
This commit is contained in:
commit
69a95613aa
|
@ -1,21 +1,31 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, gtest, openssl, zlib }:
|
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, zlib }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libtorrent-jesec";
|
pname = "libtorrent-jesec";
|
||||||
version = "0.13.8-r1";
|
version = "0.13.8-r2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jesec";
|
owner = "jesec";
|
||||||
repo = "libtorrent";
|
repo = "libtorrent";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Eh5pMkSe9uO0dPRWDg2BbbRxxuvX9FM2/OReq/61ojc=";
|
sha256 = "sha256-eIXVTbVOCRHcxSsLPvIm9F60t2upk5ORpDSOOYqTCJ4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "test-fallback";
|
||||||
|
url = "https://github.com/jesec/libtorrent/commit/a38205ce06aadc9908478ec3a9c8aefd9be06344.patch";
|
||||||
|
sha256 = "sha256-2TyQ9zYWZw6bzAfVZzTOQSkfIZnDU8ykgpRAFXscEH0=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ openssl zlib ];
|
buildInputs = [ openssl zlib ];
|
||||||
|
|
||||||
# https://github.com/jesec/libtorrent/issues/1
|
doCheck = true;
|
||||||
doCheck = false;
|
preCheck = ''
|
||||||
|
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
|
||||||
|
'';
|
||||||
checkInputs = [ gtest ];
|
checkInputs = [ gtest ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -16,13 +16,13 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "rtorrent-jesec";
|
pname = "rtorrent-jesec";
|
||||||
version = "0.9.8-r13";
|
version = "0.9.8-r14";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jesec";
|
owner = "jesec";
|
||||||
repo = "rtorrent";
|
repo = "rtorrent";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1srn1ms7dvsn994zvb8i4m6gc144ygc7wc2a23bma79cqpl7drlw";
|
sha256 = "sha256-AbjzNIha3MkCZi6MuyUfPx9r3zeXeTUzkbD7uHB85lo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
Loading…
Reference in a new issue