Merge pull request #31743 from ttuegel/firefox/wrapper

wrapFirefox: make overridable, support browserpass

pkgs/applications/networking/browsers/firefox/wrapper.nix

@@ -8,18 +8,25 @@
 , google_talk_plugin, fribid, gnome3/*.gnome_shell*/
 , esteidfirefoxplugin
 , vlc_npapi
+, browserpass
 , libudev
 , kerberos
 }:
 
 ## configurability of the wrapper itself
+
 browser:
+
+let
+  wrapper =
     { browserName ? browser.browserName or (builtins.parseDrvName browser.name).name
     , name ? (browserName + "-" + (builtins.parseDrvName browser.name).version)
     , desktopName ? # browserName with first letter capitalized
       (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
     , nameSuffix ? ""
     , icon ? browserName
+    , extraPlugins ? []
+    , extraNativeMessagingHosts ? []
     }:
 
     let
@@ -46,9 +53,12 @@ let
           ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
           ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
           ++ lib.optional (cfg.enableVLC or false) vlc_npapi
+          ++ extraPlugins
         );
       nativeMessagingHosts =
         ([ ]
+          ++ lib.optional (cfg.enableBrowserpass or false) browserpass
+          ++ extraNativeMessagingHosts
         );
       libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
             ++ lib.optional gssSupport kerberos
@@ -152,4 +162,6 @@ in stdenv.mkDerivation {
         hydraPlatforms = [];
         priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package
       };
-}
+    };
+in
+  lib.makeOverridable wrapper