diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 0e9610247c8..ddec26e9833 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -36,6 +36,9 @@ , python27Packages , rsync +# Pluggable transports +, obfsproxy + # Customization , extraPrefs ? "" , extraExtensions ? [ ] @@ -165,8 +168,14 @@ stdenv.mkDerivation rec { >> $TBDATA_PATH/torrc-defaults cat \ $bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \ + $bundleData/PTConfigs/bridge_prefs.js \ >> defaults/pref/extension-overrides.js + # Configure pluggable transports + cat >>$TBDATA_PATH/torrc-defaults <fonts,${fontsDir}," \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cbb7961f3e..d1c930a769f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4658,6 +4658,7 @@ with pkgs; 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 { };