diff options
Diffstat (limited to 'pkgs/tools/security/tor')
-rw-r--r-- | pkgs/tools/security/tor/torbrowser.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 7661d42a5d6b..490864ee2d59 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -3,16 +3,19 @@ , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib , gstreamer, gst_plugins_base, gst_plugins_good, gst_ffmpeg, gmp, ffmpeg , libpulseaudio +, mediaSupport ? false }: let - libPath = stdenv.lib.makeLibraryPath [ + libPath = stdenv.lib.makeLibraryPath ([ stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt + ] ++ stdenv.lib.optionals mediaSupport [ gstreamer gst_plugins_base gmp ffmpeg libpulseaudio - ] ; + ]); + # Ignored if !mediaSupport gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg ]; gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x: @@ -77,7 +80,9 @@ stdenv.mkDerivation rec { fi export FONTCONFIG_PATH=\$HOME/Data/fontconfig export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor - export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath} + ${stdenv.lib.optionalString mediaSupport '' + export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath} + ''} exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@" EOF chmod +x $out/bin/tor-browser |