Merge pull request #28990 from xtruder/pkgs/tor-browser/pass_tor_skip_launch

tor-browser: allow to pass TOR_CONTROL_PORT and TOR_SOCKS_PORT
2017-09-04 19:17:22 +00:00 · 2017-09-04 19:17:22 +00:00 · dd74844fff
parent f23b1a6f94 0347659542
commit dd74844fff
1 changed files with 3 additions and 0 deletions
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@ -299,7 +299,10 @@ stdenv.mkDerivation rec {
      \
      PULSE_SERVER="\''${PULSE_SERVER:-}" \
      PULSE_COOKIE="\''${PULSE_COOKIE:-}" \
+      \
      TOR_SKIP_LAUNCH="\''${TOR_SKIP_LAUNCH:-}" \
+      TOR_CONTROL_PORT="\''${TOR_CONTROL_PORT:-}" \
+      TOR_SOCKS_PORT="\''${TOR_SOCKS_PORT:-}" \
      \
      GST_PLUGIN_SYSTEM_PATH="${optionalString mediaSupport gstPluginsPath}" \
      GST_REGISTRY="/dev/null" \