diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-09-04 19:17:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-04 19:17:22 +0000 |
| commit | dd74844fff2f243f6ba87c0eb68231315caeac39 (patch) | |
| tree | f39446b8e08de4ba27369dd6444283129eef3ae0 /pkgs/applications/networking | |
| parent | f23b1a6f94663e65c2d2aa7c44b1295c58a29a0b (diff) | |
| parent | 03476595426dd2164414da16823b88e733cafe58 (diff) | |
| download | nixlib-dd74844fff2f243f6ba87c0eb68231315caeac39.tar nixlib-dd74844fff2f243f6ba87c0eb68231315caeac39.tar.gz nixlib-dd74844fff2f243f6ba87c0eb68231315caeac39.tar.bz2 nixlib-dd74844fff2f243f6ba87c0eb68231315caeac39.tar.lz nixlib-dd74844fff2f243f6ba87c0eb68231315caeac39.tar.xz nixlib-dd74844fff2f243f6ba87c0eb68231315caeac39.tar.zst nixlib-dd74844fff2f243f6ba87c0eb68231315caeac39.zip | |
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
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index cb2b8e944fc8..ca1e54aa288e 100644 --- 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" \ |