diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix new file mode 100644 index 00000000000..56fec5333fc --- /dev/null +++ b/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix @@ -0,0 +1,9 @@ +{ lib +, pkgs +, callPackage +}: + +rec { + libtorrent = callPackage ./libtorrent.nix { }; + rtorrent = callPackage ./rtorrent.nix { }; +} diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix similarity index 100% rename from pkgs/tools/networking/p2p/libtorrent/default.nix rename to pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix similarity index 100% rename from pkgs/tools/networking/p2p/rtorrent/default.nix rename to pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e335275eda1..b7df3f24117 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7164,7 +7164,13 @@ with pkgs; libnids = callPackage ../tools/networking/libnids { }; - libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; + rakshasa-rtorrent = recurseIntoAttrs + (callPackage ../tools/networking/p2p/rakshasa-rtorrent { + callPackage = newScope pkgs.rakshasa-rtorrent; + }); + + rtorrent = rakshasa-rtorrent.rtorrent; + libtorrent = rakshasa-rtorrent.libtorrent; jesec-rtorrent = recurseIntoAttrs (callPackage ../tools/networking/p2p/jesec-rtorrent { @@ -9008,8 +9014,6 @@ with pkgs; rsstail = callPackage ../applications/networking/feedreaders/rsstail { }; - rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; - rubber = callPackage ../tools/typesetting/rubber { }; rubocop = rubyPackages.rubocop;