MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 08:36:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tor-browser-bundle: use obfs4proxy

Browse source
This commit is contained in:
Will Dietz 2019-04-29 20:13:46 -05:00
parent b775493d23
commit 63a13cce7c
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
View file

@ -34,7 +34,7 @@
, rsync , rsync
# Pluggable transports # Pluggable transports
, obfsproxy , obfs4
# Customization # Customization
, extraPrefs ? "" , extraPrefs ? ""
@ -171,9 +171,9 @@ stdenv.mkDerivation rec {
EOF EOF
# Configure pluggable transports # Configure pluggable transports
cat >>$TBDATA_PATH/torrc-defaults <<EOF substituteInPlace $TBDATA_PATH/torrc-defaults \
ClientTransportPlugin obfs2,obfs3 exec ${obfsproxy}/bin/obfsproxy managed --replace "./TorBrowser/Tor/PluggableTransports/obfs4proxy" \
EOF "${obfs4}/bin/obfs4proxy"
# 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 \

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

@ -6093,7 +6093,6 @@ in
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 { };