diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2017-01-26 14:23:27 +0100 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-01-28 12:27:24 +0100 |
| commit | b18ff7ab820e7559a98e43a1c977a9c8c45eda32 (patch) | |
| tree | 437697fb290fcd007ae4bb2e16ad5015d3756171 | |
| parent | fa18c37c717a17f7fdd439aa21c88039e9b9ae37 (diff) | |
| download | nixpkgs-b18ff7ab820e7559a98e43a1c977a9c8c45eda32.tar nixpkgs-b18ff7ab820e7559a98e43a1c977a9c8c45eda32.tar.gz nixpkgs-b18ff7ab820e7559a98e43a1c977a9c8c45eda32.tar.bz2 nixpkgs-b18ff7ab820e7559a98e43a1c977a9c8c45eda32.tar.lz nixpkgs-b18ff7ab820e7559a98e43a1c977a9c8c45eda32.tar.xz nixpkgs-b18ff7ab820e7559a98e43a1c977a9c8c45eda32.tar.zst nixpkgs-b18ff7ab820e7559a98e43a1c977a9c8c45eda32.zip | |
torbrowser: make additional media playback support optional
This feature might not be appropriate for all users, leave it off by default. See 96be6a11a85e9e253cf733e57ce7c67fd1a3b81c
| -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 7661d42a5d6..490864ee2d5 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 |