wrapFirefox: Use GNU Gnash as the default Flash player, allow use of Adobe Flash

through the `firefox.enableAdobeFlash' Nixpkgs config attribute.

svn path=/nixpkgs/trunk/; revision=11037
This commit is contained in:
Ludovic Courtès 2008-03-10 15:13:06 +00:00
parent d35b3240fd
commit bd680bfc0b

View File

@ -5657,12 +5657,17 @@ rec {
wrapFirefox = firefox: nameSuffix: import ../applications/networking/browsers/firefox-wrapper {
inherit stdenv firefox nameSuffix;
plugins = []
++ lib.optional (system == "i686-linux") flashplayer
# RealPlayer is disabled by default for legal reasons.
++ lib.optional (system != "i686-linux" && getConfig ["firefox" "enableRealPlayer"] false) RealPlayer
++ lib.optional (getConfig ["firefox" "enableMPlayer"] true) MPlayerPlugin
++ lib.optional (supportsJDK && getConfig ["firefox" "jre"] true && jrePlugin ? mozillaPlugin) jrePlugin;
plugins =
let enableAdobeFlash = ((getConfig [ "firefox" "enableAdobeFlash" ] false)
&& (system == "i686-linux"));
in
([]
++ lib.optional (!enableAdobeFlash) gnash
++ lib.optional (enableAdobeFlash) flashplayer
# RealPlayer is disabled by default for legal reasons.
++ lib.optional (system != "i686-linux" && getConfig ["firefox" "enableRealPlayer"] false) RealPlayer
++ lib.optional (getConfig ["firefox" "enableMPlayer"] true) MPlayerPlugin
++ lib.optional (supportsJDK && getConfig ["firefox" "jre"] true && jrePlugin ? mozillaPlugin) jrePlugin);
};
x11vncFun = lib.sumArgs (selectVersion ../tools/X11/x11vnc "0.9.3") {