From 62ef0ec30365d324d6a07ae7e488f936b60ca468 Mon Sep 17 00:00:00 2001 From: Trim21 Date: Fri, 6 Dec 2024 03:53:40 +0800 Subject: [PATCH] rtorrent: use vendored tinyxml2 for XMLRPC --- pkgs/by-name/rt/rtorrent/package.nix | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 94da18d768917..3b58082dd422a 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -14,31 +14,22 @@ ncurses, openssl, pkg-config, - xmlrpc_c, zlib, nixosTests, - gitUpdater, + unstableGitUpdater, }: stdenv.mkDerivation rec { pname = "rakshasa-rtorrent"; - version = "0.10.0"; + version = "0.10.0-unstable-2024-12-06"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "v${version}"; - hash = "sha256-G/30Enycpqg/pWC95CzT9LY99kN4tI+S8aSQhnQO+M8="; + rev = "5a200f5d8f8bc8ed28dfc948321451585f724b15"; + hash = "sha256-RLFOHJLpt7xkrEvYwEBWs5wQRThrK1N2olI64p2TPeA="; }; - patches = [ - # fix: use fsync for osx builds - (fetchpatch { - url = "https://github.com/rakshasa/rtorrent/commit/5ce84929e44fbe3f8d6cf142e3133f43afa4071f.patch"; - hash = "sha256-bFDxbpkTZ6nIUT2zMxKMgV94vWlVNzBbIbhx4Bpr8gw="; - }) - ]; - outputs = [ "out" "man" @@ -63,17 +54,16 @@ stdenv.mkDerivation rec { libtorrent ncurses openssl - xmlrpc_c zlib ]; configureFlags = [ - "--with-xmlrpc-c" + "--with-xmlrpc-tinyxml2" "--with-posix-fallocate" ]; passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; + updateScript = unstableGitUpdater { rev-prefix = "v"; }; tests = { inherit (nixosTests) rtorrent; };