public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefox-wrapper: remove gnash support, see #22342

Browse Source
This commit is contained in:
Graham Christensen 2017-02-06 21:40:19 -05:00
parent 267813f4f7
commit 4c5b08e4e2
No known key found for this signature in database
GPG Key ID: 06121D366FE9435C
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, config { stdenv, lib, makeDesktopItem, makeWrapper, config
## various stuff that can be plugged in ## various stuff that can be plugged in
, gnash, flashplayer, hal-flash , flashplayer, hal-flash
, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 , MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2
, supportsJDK, jrePlugin, icedtea_web , supportsJDK, jrePlugin, icedtea_web
, trezor-bridge, bluejeans, djview4, adobe-reader , trezor-bridge, bluejeans, djview4, adobe-reader
@ -23,16 +23,13 @@ browser:
let let
cfg = stdenv.lib.attrByPath [ browserName ] {} config; cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or false; enableAdobeFlash = cfg.enableAdobeFlash or false;
enableGnash = cfg.enableGnash or false;
ffmpegSupport = browser.ffmpegSupport or false; ffmpegSupport = browser.ffmpegSupport or false;
jre = cfg.jre or false; jre = cfg.jre or false;
icedtea = cfg.icedtea or false; icedtea = cfg.icedtea or false;
plugins = plugins =
assert !(enableGnash && enableAdobeFlash);
assert !(jre && icedtea); assert !(jre && icedtea);
([ ] ([ ]
++ lib.optional enableGnash gnash
++ lib.optional enableAdobeFlash flashplayer ++ lib.optional enableAdobeFlash flashplayer
++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableDjvu or false) (djview4)
++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)