From bd680bfc0b34a9450afbede26a8db91e09f3a791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 Mar 2008 15:13:06 +0000 Subject: [PATCH] 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 --- pkgs/top-level/all-packages.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f7750741ba..df0566f8ef3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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") {