diff options
| author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-06-15 12:50:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-15 12:50:28 +0000 |
| commit | 47066f0776bef7e051d3303dc007724c76d6580a (patch) | |
| tree | 0738a7477d88cb13eb12350f348579475cb65c58 /pkgs/applications | |
| parent | bae863ebaed1a560fd6da5cbc40f3e977689fe23 (diff) | |
| parent | 84999e76e0d02412367a1faa30f73a310c48d5f9 (diff) | |
| download | nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar.gz nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar.bz2 nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar.lz nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar.xz nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar.zst nixlib-47066f0776bef7e051d3303dc007724c76d6580a.zip | |
Merge pull request #40893 from bkchr/plasma_5_13
plasma5: 5.12 -> 5.13
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 5b2ede611d03..6067911b7165 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -7,7 +7,7 @@ , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin -, browserpass, chrome-gnome-shell, uget-integrator +, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration , libudev , kerberos }: @@ -63,6 +63,7 @@ let ++ lib.optional (cfg.enableBrowserpass or false) browserpass ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator + ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration ++ extraNativeMessagingHosts ); libs = lib.optional ffmpegSupport ffmpeg |