From a49086c19dfc2d632bad50d3d9fa0ffc77273f31 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 16 Nov 2017 09:39:36 -0600 Subject: [PATCH] wrapFirefox: accept extraPlugins and extraNativeMessagingHosts --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index e0e0d700e74..7f9d735c163 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -24,6 +24,8 @@ let (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName) , nameSuffix ? "" , icon ? browserName + , extraPlugins ? [] + , extraNativeMessagingHosts ? [] }: let @@ -50,9 +52,11 @@ 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 = ([ ] + ++ extraNativeMessagingHosts ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) ++ lib.optional gssSupport kerberos