diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-03 16:24:30 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-03 16:35:36 -0400 |
| commit | cf06e42d1cad2732ca23264dee19bbc0d7172b3b (patch) | |
| tree | 624d0854c8f07c4d3ba2eb28590076b0486684a3 /pkgs/applications/networking/browsers/firefox/wrapper.nix | |
| parent | cbe21ac614285160a18fe21b8a804f3a2f80c51b (diff) | |
| parent | b45ef79b74d267891a11c1775a473c610ecebe78 (diff) | |
| download | nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.gz nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.bz2 nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.lz nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.xz nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.zst nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/wrapper.nix')
| -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 d56ceff81842..7ab61ec2fe5c 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 +, browserpass, chrome-gnome-shell, uget-integrator , libudev , kerberos }: @@ -62,6 +62,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 ++ extraNativeMessagingHosts ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) |