swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-29 00:20:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

wrapFirefox: add support for firefox.icedtea

Browse source
This commit is contained in:
Nikolay Amiantov 2014-09-19 06:15:06 +04:00
parent 1ff027b304
commit f7ae09b5af
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View file

@ -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