diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-02-06 21:39:09 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-02-06 21:39:09 -0500 |
| commit | 267813f4f7713bdcecff5a397ac4ab27fb9c93c1 (patch) | |
| tree | bc824c7fd4fa23b056705fbc7f8436e776070a5f /pkgs/applications/networking/browsers/firefox/wrapper.nix | |
| parent | f77bc59af647f9fc055fb16077cf433d944988bc (diff) | |
| download | nixlib-267813f4f7713bdcecff5a397ac4ab27fb9c93c1.tar nixlib-267813f4f7713bdcecff5a397ac4ab27fb9c93c1.tar.gz nixlib-267813f4f7713bdcecff5a397ac4ab27fb9c93c1.tar.bz2 nixlib-267813f4f7713bdcecff5a397ac4ab27fb9c93c1.tar.lz nixlib-267813f4f7713bdcecff5a397ac4ab27fb9c93c1.tar.xz nixlib-267813f4f7713bdcecff5a397ac4ab27fb9c93c1.tar.zst nixlib-267813f4f7713bdcecff5a397ac4ab27fb9c93c1.zip | |
Revert "firefox-wrapper: remove gnash support, see #22342"
Accidentally committed other changes This reverts commit f77bc59af647f9fc055fb16077cf433d944988bc.
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/wrapper.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ad1091c9d39e..e5e8cacd21cd 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,7 +1,7 @@ { stdenv, lib, makeDesktopItem, makeWrapper, config ## various stuff that can be plugged in -, flashplayer, hal-flash +, gnash, flashplayer, hal-flash , MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 , supportsJDK, jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader @@ -23,13 +23,16 @@ browser: let cfg = stdenv.lib.attrByPath [ browserName ] {} config; enableAdobeFlash = cfg.enableAdobeFlash or false; + enableGnash = cfg.enableGnash or false; ffmpegSupport = browser.ffmpegSupport or false; jre = cfg.jre or false; icedtea = cfg.icedtea or false; plugins = + assert !(enableGnash && enableAdobeFlash); assert !(jre && icedtea); ([ ] + ++ lib.optional enableGnash gnash ++ lib.optional enableAdobeFlash flashplayer ++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) |