public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tor-browser-bundle: support transports obfs2,obfs3

Browse Source
This commit is contained in:
Joachim Fasting 2017-09-30 15:40:32 +02:00
parent ae4c8e0889
commit ba689a2740
No known key found for this signature in database
GPG Key ID: 66EAB6B14F6B6E0D
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
View File

@ -36,6 +36,9 @@
, python27Packages , python27Packages
, rsync , rsync
# Pluggable transports
, obfsproxy
# Customization # Customization
, extraPrefs ? "" , extraPrefs ? ""
, extraExtensions ? [ ] , extraExtensions ? [ ]
@ -165,8 +168,14 @@ stdenv.mkDerivation rec {
>> $TBDATA_PATH/torrc-defaults >> $TBDATA_PATH/torrc-defaults
cat \ cat \
$bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \ $bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \
$bundleData/PTConfigs/bridge_prefs.js \
>> defaults/pref/extension-overrides.js >> defaults/pref/extension-overrides.js
# Configure pluggable transports
cat >>$TBDATA_PATH/torrc-defaults <<EOF
ClientTransportPlugin obfs2,obfs3 exec ${obfsproxy}/bin/obfsproxy managed
EOF
# Hard-code path to TBB fonts; xref: FONTCONFIG_FILE in the wrapper below # Hard-code path to TBB fonts; xref: FONTCONFIG_FILE in the wrapper below
sed $bundleData/$bundlePlatform/Data/fontconfig/fonts.conf \ sed $bundleData/$bundlePlatform/Data/fontconfig/fonts.conf \
-e "s,<dir>fonts</dir>,<dir>${fontsDir}</dir>," \ -e "s,<dir>fonts</dir>,<dir>${fontsDir}</dir>," \

1
pkgs/top-level/all-packages.nix
View File

@ -4658,6 +4658,7 @@ with pkgs;
tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle {
stdenv = stdenvNoCC; stdenv = stdenvNoCC;
tor-browser-unwrapped = firefoxPackages.tor-browser; tor-browser-unwrapped = firefoxPackages.tor-browser;
inherit (python27Packages) obfsproxy;
}; };
touchegg = callPackage ../tools/inputmethods/touchegg { }; touchegg = callPackage ../tools/inputmethods/touchegg { };