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

Merge pull request #4157 from abbradar/icedtea-web

Browse Source 
Add support for IcedTea in Firefox
This commit is contained in:
William A. Kennington III 2014-09-19 10:30:28 -07:00
commit 4cb5e39de6
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

@ -10331,18 +10331,22 @@ 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; enableGnash = cfg.enableGnash or false;
jre = cfg.jre or false;
icedtea = cfg.icedtea or false;
in in
import ../applications/networking/browsers/firefox/wrapper.nix { import ../applications/networking/browsers/firefox/wrapper.nix {
inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
plugins = plugins =
assert !(enableGnash && enableAdobeFlash); assert !(enableGnash && enableAdobeFlash);
assert !(jre && icedtea);
([ ] ([ ]
++ lib.optional enableGnash gnash ++ 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)
++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer ++ 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.enableGoogleTalkPlugin or false) google_talk_plugin
++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell