public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wrapFirefox: accept extraPlugins and extraNativeMessagingHosts

This commit is contained in:
Thomas Tuegel 2017-11-16 09:39:36 -06:00
parent c05520f298
commit a49086c19d
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -24,6 +24,8 @@ let
(lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName) (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
, nameSuffix ? "" , nameSuffix ? ""
, icon ? browserName , icon ? browserName
, extraPlugins ? []
, extraNativeMessagingHosts ? []
}: }:
let let
@ -50,9 +52,11 @@ let
++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
++ lib.optional (cfg.enableVLC or false) vlc_npapi ++ lib.optional (cfg.enableVLC or false) vlc_npapi
++ extraPlugins
); );
nativeMessagingHosts = nativeMessagingHosts =
([ ] ([ ]
++ extraNativeMessagingHosts
); );
libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
++ lib.optional gssSupport kerberos ++ lib.optional gssSupport kerberos