From db4b6d56a4782f8f5acf727c40e342999af7228b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Sep 2008 09:46:21 +0000 Subject: [PATCH] Allow `wrapFirefox' to read per-browser options. svn path=/nixpkgs/trunk/; revision=12889 --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b94a6c47d1..e1e1f05e247 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6943,16 +6943,16 @@ let wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox-wrapper { inherit stdenv nameSuffix makeWrapper browser browserName; plugins = - let enableAdobeFlash = getConfig [ "firefox" "enableAdobeFlash" ] true + let enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true && 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 browser) - ++ lib.optional (supportsJDK && getConfig ["firefox" "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin + ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer + ++ lib.optional (getConfig [browserName "enableMPlayer"] true) (MPlayerPlugin browser) + ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin ); };