mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 05:43:50 +03:00
wrapFirefox: add support for firefox.icedtea
This commit is contained in:
parent
1ff027b304
commit
f7ae09b5af
@ -10324,18 +10324,22 @@ let
|
||||
cfg = stdenv.lib.attrByPath [ browserName ] {} config;
|
||||
enableAdobeFlash = cfg.enableAdobeFlash or false;
|
||||
enableGnash = cfg.enableGnash or false;
|
||||
jre = cfg.jre or false;
|
||||
icedtea = cfg.icedtea or false;
|
||||
in
|
||||
import ../applications/networking/browsers/firefox/wrapper.nix {
|
||||
inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
|
||||
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)
|
||||
++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer
|
||||
++ lib.optional (supportsJDK && cfg.jre or false && jrePlugin ? mozillaPlugin) jrePlugin
|
||||
++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
|
||||
++ lib.optional icedtea icedtea7_web
|
||||
++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
|
||||
++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
|
||||
++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
|
||||
|
Loading…
Reference in New Issue
Block a user