diff options
| -rw-r--r-- | pkgs/applications/networking/browsers/tor-browser-bundle/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 2c6940e037cd..834be5cd3020 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -34,7 +34,7 @@ , rsync # Pluggable transports -, obfsproxy +, obfs4 # Customization , extraPrefs ? "" @@ -171,9 +171,9 @@ stdenv.mkDerivation rec { EOF # Configure pluggable transports - cat >>$TBDATA_PATH/torrc-defaults <<EOF - ClientTransportPlugin obfs2,obfs3 exec ${obfsproxy}/bin/obfsproxy managed - EOF + substituteInPlace $TBDATA_PATH/torrc-defaults \ + --replace "./TorBrowser/Tor/PluggableTransports/obfs4proxy" \ + "${obfs4}/bin/obfs4proxy" # Hard-code path to TBB fonts; xref: FONTCONFIG_FILE in the wrapper below sed $bundleData/$bundlePlatform/Data/fontconfig/fonts.conf \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49c2cd2eed15..15561dc6ae3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6093,7 +6093,6 @@ in tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { stdenv = stdenvNoCC; tor-browser-unwrapped = firefoxPackages.tor-browser; - inherit (python27Packages) obfsproxy; }; touchegg = callPackage ../tools/inputmethods/touchegg { }; |