From 705e87fe0f479b06e2a1de88c683d0a7d8277427 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Wed, 28 Mar 2007 18:55:57 +0000
Subject: [PATCH] jre: by default don't support the plugin

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f1fb0206a74..3defbda5a123 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -749,9 +749,11 @@ rec {
   };
 
 
-  jdk       = jdkdistro true false;
-  jre       = jdkdistro false true;
+  jdk       = jdkdistro true  false;
+  jre       = jdkdistro false false;
+
   jdkPlugin = jdkdistro true true;
+  jrePlugin = jdkdistro false true;
 
   jdkdistro = installjdk : pluginSupport:
     if stdenv.isDarwin then 
@@ -2972,7 +2974,7 @@ rec {
     ]
     # RealPlayer is disabled by default for legal reasons.
     ++ (if getConfig ["firefox" "enableRealPlayer"] false then [RealPlayer] else [])
-    ++ (if jre != false then [jre] else []);
+    ++ (if jrePlugin != false then [jrePlugin] else []);
   };
 
   xara = import ../applications/graphics/xara {
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index eaf724bf6771..ba6326d64141 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -73,7 +73,7 @@ let {
     jetty
     jikes
     jing_tools
-    jre
+    jrePlugin
     kcachegrind
     keen4
     kernel