diff options
| author | lassulus <lassulus@lassul.us> | 2020-08-06 23:24:29 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-08-06 23:24:29 +0200 |
| commit | e0e91cfd74c9ce5d3f9ce9c2e2efab322a00f960 (patch) | |
| tree | f17565a1d7bc496b0b439ff45010f3f9c91c6d4f /jeschli | |
| parent | 04d9ff2dcdc039518391fcb41ffbb256e2f4ba23 (diff) | |
| parent | 42df7da046f46efaca0cb0243a6de3aff599c8aa (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'jeschli')
| -rw-r--r-- | jeschli/5pkgs/firefox/firefox-with-config.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/jeschli/5pkgs/firefox/firefox-with-config.nix b/jeschli/5pkgs/firefox/firefox-with-config.nix index 9be6250d7..fc22c434e 100644 --- a/jeschli/5pkgs/firefox/firefox-with-config.nix +++ b/jeschli/5pkgs/firefox/firefox-with-config.nix @@ -5,7 +5,7 @@ , MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web , bluejeans, djview4, adobe-reader -, google_talk_plugin, fribid, gnome3/*.gnome-shell*/ +, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin ? "" , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , udev @@ -82,7 +82,6 @@ let ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin ++ lib.optional icedtea 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 ++ lib.optional (cfg.enableBluejeans or false) bluejeans |