@@ -34,8 +34,8 @@ let
3434 User tor
3535 DataDirectory ${torDirectory}
3636 ${optionalString cfg.enableGeoIP ''
37− GeoIPFile ${pkgs.tor.geoip}/share/tor/geoip
38− GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6
37+ GeoIPFile ${cfg.package.geoip}/share/tor/geoip
38+ GeoIPv6File ${cfg.package.geoip}/share/tor/geoip6
3939 ''}
4040
4141 ${optint "ControlPort" cfg.controlPort}
@@ -123,6 +123,16 @@ in
123123 '';
124124 };
125125
126+ package = mkOption {
127+ type = types.package;
128+ default = pkgs.tor;
129+ defaultText = "pkgs.tor";
130+ example = literalExample "pkgs.tor";
131+ description = ''
132+ Tor package to use
133+ '';
134+ };
135+
126136 enableGeoIP = mkOption {
127137 type = types.bool;
128138 default = true;
@@ -749,8 +759,8 @@ in
749759 serviceConfig =
750760 { Type = "simple";
751761 # Translated from the upstream contrib/dist/tor.service.in
752− ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config";
753− ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile}";
762+ ExecStartPre = "${cfg.package}/bin/tor -f ${torRcFile} --verify-config";
763+ ExecStart = "${cfg.package}/bin/tor -f ${torRcFile}";
754764 ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
755765 KillSignal = "SIGINT";
756766 TimeoutSec = 30;
@@ -773,7 +783,7 @@ in
773783 };
774784 };
775785
776− environment.systemPackages = [ pkgs.tor ];
786+ environment.systemPackages = [ cfg.package ];
777787
778788 services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) {
779789 enable = true;