summary refs log tree commit diff
diff options
context:
space:
mode:
authorRostislav Beneš <r.dee.b.b@gmail.com>2018-01-13 15:20:01 +0100
committerJan Tojnar <jtojnar@gmail.com>2018-01-13 15:22:52 +0100
commit062cafab8cffa984f6e8b1a287d6a66c83238801 (patch)
treeafc72f9f3eefeacd2439270f44247ef5b8ce6b43
parent38b6d7b60ea32c7a6ea6234e72c1ad3249fc70a0 (diff)
downloadnixpkgs-062cafab8cffa984f6e8b1a287d6a66c83238801.tar
nixpkgs-062cafab8cffa984f6e8b1a287d6a66c83238801.tar.gz
nixpkgs-062cafab8cffa984f6e8b1a287d6a66c83238801.tar.bz2
nixpkgs-062cafab8cffa984f6e8b1a287d6a66c83238801.tar.lz
nixpkgs-062cafab8cffa984f6e8b1a287d6a66c83238801.tar.xz
nixpkgs-062cafab8cffa984f6e8b1a287d6a66c83238801.tar.zst
nixpkgs-062cafab8cffa984f6e8b1a287d6a66c83238801.zip
firefox: add option for chrome-gnome-shell native messaging host
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix3
-rw-r--r--pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix2
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index dd4cb439c1f..010f60881b5 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -8,7 +8,7 @@
 , google_talk_plugin, fribid, gnome3/*.gnome_shell*/
 , esteidfirefoxplugin
 , vlc_npapi
-, browserpass
+, browserpass, chrome-gnome-shell
 , libudev
 , kerberos
 }:
@@ -63,6 +63,7 @@ let
       nativeMessagingHosts =
         ([ ]
           ++ lib.optional (cfg.enableBrowserpass or false) browserpass
+          ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
           ++ extraNativeMessagingHosts
         );
       libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
index 9fc635b2190..11d891b6743 100644
--- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "GNOME Shell integration for Chrome";
     longDescription = ''
-      To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/Installation">browser extension</link>, and then set <option>services.gnome3.chrome-gnome-shell.enable</option> to <literal>true</literal>.
+      To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/Installation">browser extension</link>, and then set <option>services.gnome3.chrome-gnome-shell.enable</option> to <literal>true</literal>. For Firefox based browsers, you will also need to build the wrappers with <option>nixpkgs.config.firefox.enableGnomeExtensions</option> set to <literal>true</literal>.
     '';
     license = licenses.gpl3;
     maintainers = gnome3.maintainers;