diff options
| author | Stefano Mazzucco <stefano@curso.re> | 2019-08-21 20:21:39 +0100 |
|---|---|---|
| committer | Stefano Mazzucco <stefano@curso.re> | 2019-08-23 21:12:59 +0100 |
| commit | a6d234e9e9916a7a2dc57bda3abef98ea043f097 (patch) | |
| tree | ceda72889bc024124e8cca793acbe2b0e8e27b41 /pkgs/applications/networking/browsers/firefox | |
| parent | f20fbeedcf8891b80bfb2440df7168650e7a0d1f (diff) | |
| download | nixlib-a6d234e9e9916a7a2dc57bda3abef98ea043f097.tar nixlib-a6d234e9e9916a7a2dc57bda3abef98ea043f097.tar.gz nixlib-a6d234e9e9916a7a2dc57bda3abef98ea043f097.tar.bz2 nixlib-a6d234e9e9916a7a2dc57bda3abef98ea043f097.tar.lz nixlib-a6d234e9e9916a7a2dc57bda3abef98ea043f097.tar.xz nixlib-a6d234e9e9916a7a2dc57bda3abef98ea043f097.tar.zst nixlib-a6d234e9e9916a7a2dc57bda3abef98ea043f097.zip | |
adoptopenjdk-icedtea-web: rename from icedtea_web
This is a follow up of https://github.com/NixOS/nixpkgs/pull/66422 - rename icedtea_web to adoptopenjdk-icedtea-web to reflect the new governance - add icedtea_web and icedtea8_web to aliases.nix for backwards compatibility - update the attribute name where icedtea_web is used
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index bc1678335947..ec98dc78478b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -3,7 +3,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash , MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd -, jrePlugin, icedtea_web +, jrePlugin, adoptopenjdk-icedtea-web , bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin @@ -55,7 +55,7 @@ let ++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional icedtea icedtea_web + ++ lib.optional icedtea adoptopenjdk-icedtea-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 |