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

wrapFirefox: make overridable

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

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

@ -13,16 +13,20 @@
}: }:
## configurability of the wrapper itself ## configurability of the wrapper itself
browser: browser:
{ 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
}:
let 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
}:
let
cfg = stdenv.lib.attrByPath [ browserName ] {} config; cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or false; enableAdobeFlash = cfg.enableAdobeFlash or false;
ffmpegSupport = browser.ffmpegSupport or false; ffmpegSupport = browser.ffmpegSupport or false;
@ -59,7 +63,7 @@ let
gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
gtk_modules = [ libcanberra_gtk2 ]; gtk_modules = [ libcanberra_gtk2 ];
in stdenv.mkDerivation { in stdenv.mkDerivation {
inherit name; inherit name;
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -152,4 +156,6 @@ in stdenv.mkDerivation {
hydraPlatforms = []; hydraPlatforms = [];
priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package
}; };
} };
in
lib.makeOverridable wrapper