diff options
| author | makefu <github@syntax-fehler.de> | 2020-08-11 12:12:13 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2020-08-11 12:12:13 +0200 |
| commit | 4cb0ff12ba563693b6be7aac3c7cc8c6ce7a003c (patch) | |
| tree | 2eceb32d72c1799938bce57240566ba576c2c3b4 /jeschli | |
| parent | 93606315b99a2540c5859d93eb2377ae32fa6506 (diff) | |
| parent | f556a302f62434e0a47ef23db7e569bdb9c489f6 (diff) | |
Merge remote-tracking branch 'lass/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 |