about summary refs log tree commit diff
path: root/pkgs/tools/networking
diff options
context:
space:
mode:
authorWinter <winter@winter.cafe>2021-05-30 20:58:24 -0400
committerWinter <winter@winter.cafe>2021-06-03 20:36:20 -0400
commit9e95d55c5b4626c43525e92ea9209c33765232aa (patch)
tree735ae46472ef5a970bdb83fd6e4220b0d71c68a4 /pkgs/tools/networking
parent0e705d7a255efbc6d5e345985da46f34a4f4afae (diff)
downloadnixlib-9e95d55c5b4626c43525e92ea9209c33765232aa.tar
nixlib-9e95d55c5b4626c43525e92ea9209c33765232aa.tar.gz
nixlib-9e95d55c5b4626c43525e92ea9209c33765232aa.tar.bz2
nixlib-9e95d55c5b4626c43525e92ea9209c33765232aa.tar.lz
nixlib-9e95d55c5b4626c43525e92ea9209c33765232aa.tar.xz
nixlib-9e95d55c5b4626c43525e92ea9209c33765232aa.tar.zst
nixlib-9e95d55c5b4626c43525e92ea9209c33765232aa.zip
libtorrent-jesec: 0.13.8-r1 -> 0.13.8-r2
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--pkgs/tools/networking/p2p/libtorrent-jesec/default.nix20
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix
index 3858d87e7edf..0fd16f4799d6 100644
--- a/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix
@@ -1,21 +1,31 @@
-{ lib, stdenv, fetchFromGitHub, cmake, gtest, openssl, zlib }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libtorrent-jesec";
-  version = "0.13.8-r1";
+  version = "0.13.8-r2";
 
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "libtorrent";
     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 ];
   buildInputs = [ openssl zlib ];
 
-  # https://github.com/jesec/libtorrent/issues/1
-  doCheck = false;
+  doCheck = true;
+  preCheck = ''
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
+  '';
   checkInputs = [ gtest ];
 
   meta = with lib; {