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

Allow `wrapFirefox' to read per-browser options.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12889
This commit is contained in:
Ludovic Courtès 2008-09-19 09:46:21 +00:00
parent a04d2c14be
commit db4b6d56a4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -6943,16 +6943,16 @@ let
wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox-wrapper { wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox-wrapper {
inherit stdenv nameSuffix makeWrapper browser browserName; inherit stdenv nameSuffix makeWrapper browser browserName;
plugins = plugins =
let enableAdobeFlash = getConfig [ "firefox" "enableAdobeFlash" ] true let enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true
&& system == "i686-linux"; && system == "i686-linux";
in in
([] ([]
++ lib.optional (!enableAdobeFlash) gnash ++ lib.optional (!enableAdobeFlash) gnash
++ lib.optional (enableAdobeFlash) flashplayer ++ lib.optional (enableAdobeFlash) flashplayer
# RealPlayer is disabled by default for legal reasons. # RealPlayer is disabled by default for legal reasons.
++ lib.optional (system != "i686-linux" && getConfig ["firefox" "enableRealPlayer"] false) RealPlayer ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer
++ lib.optional (getConfig ["firefox" "enableMPlayer"] true) (MPlayerPlugin browser) ++ lib.optional (getConfig [browserName "enableMPlayer"] true) (MPlayerPlugin browser)
++ lib.optional (supportsJDK && getConfig ["firefox" "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin
); );
}; };