From 4233fcc94b06d615e92e94ad560b65819a2ba47f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Apr 2007 10:22:20 +0000
Subject: [PATCH] * Fix the JRE plugin test.

svn path=/nixpkgs/trunk/; revision=8577
---
 pkgs/top-level/all-packages.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2095041d77e..ff3f8bdd6ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -765,11 +765,16 @@ rec {
   jdkPlugin = jdkdistro true true;
   jrePlugin = jdkdistro false true;
 
+  supportsJDK =
+    system == "i686-linux" ||
+    system == "x86_64-linux" ||
+    system == "powerpc-linux";
+
   jdkdistro = installjdk: pluginSupport:
     if stdenv.isDarwin then 
       "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"
     else
-      assert system == "i686-linux" || system == "x86_64-linux" || system == "powerpc-linux";
+      assert supportsJDK;
       import ../development/compilers/jdk {
         inherit fetchurl stdenv unzip installjdk xlibs pluginSupport;
         libstdcpp5 = gcc33.gcc;
@@ -2999,7 +3004,7 @@ rec {
     ]
     # RealPlayer is disabled by default for legal reasons.
     ++ (if getConfig ["firefox" "enableRealPlayer"] false then [RealPlayer] else [])
-    ++ (if jrePlugin != false then [jrePlugin] else []);
+    ++ (if supportsJDK then [jrePlugin] else []);
   };
 
   xara = import ../applications/graphics/xara {