diff --git a/hosts/by-name/servo/services/default.nix b/hosts/by-name/servo/services/default.nix index a0ca90617..53c462ae0 100644 --- a/hosts/by-name/servo/services/default.nix +++ b/hosts/by-name/servo/services/default.nix @@ -10,7 +10,7 @@ ./gitea.nix ./goaccess.nix ./ipfs.nix - ./jackett.nix + ./jackett ./jellyfin.nix ./kiwix-serve.nix ./komga.nix diff --git a/pkgs/patched/jackett/01-fix-bind-host.patch b/hosts/by-name/servo/services/jackett/01-fix-bind-host.patch similarity index 100% rename from pkgs/patched/jackett/01-fix-bind-host.patch rename to hosts/by-name/servo/services/jackett/01-fix-bind-host.patch diff --git a/hosts/by-name/servo/services/jackett.nix b/hosts/by-name/servo/services/jackett/default.nix similarity index 75% rename from hosts/by-name/servo/services/jackett.nix rename to hosts/by-name/servo/services/jackett/default.nix index 7c2f9e88e..235a34320 100644 --- a/hosts/by-name/servo/services/jackett.nix +++ b/hosts/by-name/servo/services/jackett/default.nix @@ -6,6 +6,15 @@ { user = "root"; group = "root"; path = "/var/lib/jackett"; method = "bind"; } ]; services.jackett.enable = true; + services.jackett.package = pkgs.jackett.overrideAttrs (upstream: { + # 2022-07-29: check phase segfaults on arm (with or without my patches) + doCheck = false; + patches = (upstream.patches or []) ++ [ + # bind to an IP address which is usable behind a netns. + # jackett doesn't allow customization of the bind address: this will probably always be here. + ./01-fix-bind-host.patch + ]; + }); systemd.services.jackett.after = [ "wireguard-wg-ovpns.service" ]; systemd.services.jackett.partOf = [ "wireguard-wg-ovpns.service" ]; diff --git a/pkgs/default.nix b/pkgs/default.nix index e55b48ff7..726ea31bb 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -167,9 +167,6 @@ let # ibus = callPackage ./patched/ibus { inherit (unpatched) ibus; }; - # jackett doesn't allow customization of the bind address: this will probably always be here. - jackett = callPackage ./patched/jackett { inherit (unpatched) jackett; }; - # modemmanager = callPackage ./patched/modemmanager { inherit (unpatched) modemmanager; }; playerctl = unpatched.playerctl.overrideAttrs (upstream: { diff --git a/pkgs/patched/jackett/default.nix b/pkgs/patched/jackett/default.nix deleted file mode 100644 index c60de3a55..000000000 --- a/pkgs/patched/jackett/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ jackett }: - -(jackett.overrideAttrs (upstream: { - # 2022-07-29: check phase segfaults on arm (with or without my patches) - doCheck = false; - patches = (upstream.patches or []) ++ [ - # bind to an IP address which is usable behind a netns - ./01-fix-bind-host.patch - ]; -})) -