forked from mirrors/nixpkgs
jesec-rtorrent: create subtree
RTorrent uses a companion library, libtorrent, and they should be synchronized along the releases. They act like a small package set. Therefore it is a good idea to treat them the same way in Nixpkgs code. This commit should not change much of the things, because no code besides rtorrent uses libtorrent. (Yes, this the same message from rakshasa-rtorrent commit.)
This commit is contained in:
parent
92b0e34180
commit
07e7d46e0c
9
pkgs/tools/networking/p2p/jesec-rtorrent/default.nix
Normal file
9
pkgs/tools/networking/p2p/jesec-rtorrent/default.nix
Normal file
|
@ -0,0 +1,9 @@
|
|||
{ lib
|
||||
, pkgs
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
rec {
|
||||
libtorrent = callPackage ./libtorrent.nix { };
|
||||
rtorrent = callPackage ./rtorrent.nix { };
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtorrent-jesec";
|
||||
pname = "jesec-libtorrent";
|
||||
version = "0.13.8-r2";
|
||||
|
||||
src = fetchFromGitHub {
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gtest
|
||||
, libtorrent-jesec
|
||||
, libtorrent
|
||||
, curl
|
||||
, ncurses
|
||||
, xmlrpc_c
|
||||
|
@ -15,7 +15,7 @@ let
|
|||
inherit (lib) optional;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rtorrent-jesec";
|
||||
pname = "jesec-rtorrent";
|
||||
version = "0.9.8-r14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libtorrent-jesec curl ncurses ]
|
||||
buildInputs = [ libtorrent curl ncurses ]
|
||||
++ optional xmlRpcSupport xmlrpc_c
|
||||
++ optional jsonRpcSupport nlohmann_json;
|
||||
|
|
@ -7166,7 +7166,13 @@ with pkgs;
|
|||
|
||||
libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
|
||||
|
||||
libtorrent-jesec = callPackage ../tools/networking/p2p/libtorrent-jesec { };
|
||||
jesec-rtorrent = recurseIntoAttrs
|
||||
(callPackage ../tools/networking/p2p/jesec-rtorrent {
|
||||
callPackage = newScope pkgs.jesec-rtorrent;
|
||||
});
|
||||
|
||||
rtorrent-jesec = jesec-rtorrent.rtorrent;
|
||||
libtorrent-jesec = jesec-rtorrent.libtorrent;
|
||||
|
||||
libmpack = callPackage ../development/libraries/libmpack { };
|
||||
|
||||
|
@ -9004,8 +9010,6 @@ with pkgs;
|
|||
|
||||
rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
|
||||
|
||||
rtorrent-jesec = callPackage ../tools/networking/p2p/rtorrent-jesec { };
|
||||
|
||||
rubber = callPackage ../tools/typesetting/rubber { };
|
||||
|
||||
rubocop = rubyPackages.rubocop;
|
||||
|
|
Loading…
Reference in a new issue