From bba42d4821c3a48ce2b9d61cede863f9c685340b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Jun 2008 11:20:47 +0000
Subject: [PATCH] * Firefox: revert to using flashplayer until gnash works
 better. * Firefox: disable Java plugin support by default since few people  
 care about it anymore.

svn path=/nixpkgs/trunk/; revision=12116
---
 pkgs/top-level/all-packages.nix      | 4 ++--
 pkgs/top-level/build-for-release.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f65d6fecd703..90a45aa7c41b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6481,7 +6481,7 @@ let pkgs = rec {
   wrapFirefox = firefox: nameSuffix: import ../applications/networking/browsers/firefox-wrapper {
     inherit stdenv firefox nameSuffix makeWrapper;
     plugins =
-      let enableAdobeFlash = getConfig [ "firefox" "enableAdobeFlash" ] false
+      let enableAdobeFlash = getConfig [ "firefox" "enableAdobeFlash" ] true
             && system == "i686-linux";
       in
        ([]
@@ -6490,7 +6490,7 @@ let pkgs = rec {
         # 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
+        ++ lib.optional (supportsJDK && getConfig ["firefox" "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin
        );
   };
 
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 3018b8bef692..9caa6fe2bd07 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -53,7 +53,7 @@ let
     feh
     file
     findutils
-    firefoxWrapper
+    firefox
     flex2533
     gawk
     gcc
@@ -234,7 +234,7 @@ let
     binutils
     bison23
     emacs
-    firefoxWrapper
+    firefox
     gcc
     hello
     libtool