summaryrefslogtreecommitdiffstats
path: root/pkgs/applications
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2020-11-12 23:32:14 +0000
committerGitHub <noreply@github.com>2020-11-12 23:32:14 +0000
commitb719eb3c9ff95f6cd63b733411afbe211dd84f5e (patch)
tree7e4eaa8be2dfa2d82dd05274acbebf7d5a446d80 /pkgs/applications
parentb1680e3f7193e486782c03d1ced53d8daef047ef (diff)
parent4117c0b7dfed3b4ada58a00bf2bd8b61357c65d4 (diff)
Merge pull request #103570 from chkno/tor-noscript
tor-browser-bundle-bin: Fix extension path. Fixes NoScript.
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix6
1 files changed, 3 insertions, 3 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 f6f6deb7380e..ff2501d47ce0 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -231,9 +231,10 @@ stdenv.mkDerivation rec {
# Preload extensions by moving into the runtime instead of storing under the
# user's profile directory.
- mkdir -p "$TBB_IN_STORE/browser/extensions"
+ # See https://support.mozilla.org/en-US/kb/deploying-firefox-with-extensions
+ mkdir -p "$TBB_IN_STORE/distribution/extensions"
mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \
- "$TBB_IN_STORE/browser/extensions"
+ "$TBB_IN_STORE/distribution/extensions"
# Hard-code paths to geoip data files. TBB resolves the geoip files
# relative to torrc-defaults_path but if we do not hard-code them
@@ -409,6 +410,5 @@ stdenv.mkDerivation rec {
# the compound is "libre" in a strict sense (some components place certain
# restrictions on redistribution), it's free enough for our purposes.
license = licenses.free;
- broken = true;
};
}