From 73ff43b391531565a8542acbdee03693a51d1cc3 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 21 Apr 2022 19:49:32 -0400 Subject: [PATCH] jesec-rtorrent: clean up formatting --- pkgs/applications/networking/p2p/jesec-rtorrent/default.nix | 2 +- pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index 0df07cd5510a..a760a0f96c35 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { ++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO" ++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO"; - doCheck = true; + checkInputs = [ gtest ]; diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix index fb7515e8671f..a08eb8f1293c 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -21,15 +21,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl zlib ]; doCheck = true; + preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD ''; + checkInputs = [ gtest ];