From 5f61d1f92f8c9fa0c69ec0aceea1884b05b6e666 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 24 Aug 2016 00:19:01 +0200 Subject: m 3 rtorrent: only buidl rutorrent if webcfg is enabled as well --- makefu/3modules/rtorrent.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'makefu/3modules') diff --git a/makefu/3modules/rtorrent.nix b/makefu/3modules/rtorrent.nix index 98eb5f10..02c92251 100644 --- a/makefu/3modules/rtorrent.nix +++ b/makefu/3modules/rtorrent.nix @@ -78,7 +78,8 @@ let # This only works because none of the attrsets returns the same key config = with lib; mkIf cfg.enable (lib.mkMerge [ (lib.mkIf webcfg.enable rpcweb-imp) - (lib.mkIf rucfg.enable rutorrent-imp) + # only build rutorrent-imp if webcfg is enabled as well + (lib.mkIf (webcfg.enable && rucfg.enable) rutorrent-imp) imp ]); }; @@ -111,7 +112,8 @@ let }; rutorrent = { - enable = mkEnableOption "rutorrent"; + enable = mkEnableOption "rutorrent"; # requires rtorrent.web.enable + package = mkOption { type = types.package; description = '' -- cgit v1.2.3