diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-02-06 21:40:19 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-02-06 21:40:19 -0500 |
| commit | 4c5b08e4e21504229552575eb0420971449d149d (patch) | |
| tree | f4d0a51dcfac8eadc8d374f2a0dd80c14f02400e /pkgs | |
| parent | 267813f4f7713bdcecff5a397ac4ab27fb9c93c1 (diff) | |
| download | nixpkgs-4c5b08e4e21504229552575eb0420971449d149d.tar nixpkgs-4c5b08e4e21504229552575eb0420971449d149d.tar.gz nixpkgs-4c5b08e4e21504229552575eb0420971449d149d.tar.bz2 nixpkgs-4c5b08e4e21504229552575eb0420971449d149d.tar.lz nixpkgs-4c5b08e4e21504229552575eb0420971449d149d.tar.xz nixpkgs-4c5b08e4e21504229552575eb0420971449d149d.tar.zst nixpkgs-4c5b08e4e21504229552575eb0420971449d149d.zip | |
firefox-wrapper: remove gnash support, see #22342
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index e5e8cacd21c..ad1091c9d39 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 -, gnash, flashplayer, hal-flash +, flashplayer, hal-flash , MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 , supportsJDK, jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader @@ -23,16 +23,13 @@ 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) |