summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Schröter <dev@felschr.com>2023-04-14 19:11:52 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-04-19 23:47:46 +0000
commitb8cd7208860713be836e518232a09dc075987a31 (patch)
tree924f24d88767865ebf13788de01f4e99a4fc4b06
parentMerge pull request #227118 from NixOS/backport-226799-to-release-22.11 (diff)
downloadnixpkgs-b8cd7208860713be836e518232a09dc075987a31.tar.gz
tor-browser-bundle-bin: fix IPC socket issue
(cherry picked from commit dfc599c71ae1a0730dcb37477f257bf882fdc005)
-rw-r--r--pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix3
1 files changed, 2 insertions, 1 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 edf2d17a75da..57f97df4befd 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -211,7 +211,7 @@ stdenv.mkDerivation rec {
// Insist on using IPC for communicating with Tor
//
- // Defaults to creating \$TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket
+ // Defaults to creating \$XDG_RUNTIME_DIR/Tor/{socks,control}.socket
lockPref("extensions.torlauncher.control_port_use_ipc", true);
lockPref("extensions.torlauncher.socks_port_use_ipc", true);
@@ -333,6 +333,7 @@ stdenv.mkDerivation rec {
echo "user_pref(\"extensions.torlauncher.toronionauthdir_path\", \"\$HOME/TorBrowser/Data/Tor/onion-auth\");"
echo "user_pref(\"extensions.torlauncher.torrc_path\", \"\$HOME/TorBrowser/Data/Tor/torrc\");"
echo "user_pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/TorBrowser/Data/Tor\");"
+ echo "user_pref(\"network.proxy.socks\", \"file://\$XDG_RUNTIME_DIR/Tor/socks.socket\");"
} >> "\$HOME/TorBrowser/Data/Browser/profile.default/prefs.js"
# Lift-off