* In the JDK packages, don't return false if the platform is

  unsupported.  This gives a type error ("value is a boolean while 
  an attribute set was expected").

svn path=/nixpkgs/trunk/; revision=8576

3 files changed, 10 insertions, 8 deletions

diff --git a/pkgs/development/compilers/jdk/default-1.4.nix b/pkgs/development/compilers/jdk/default-1.4.nix
index 097af70bc1c9..48eb5e6e7b71 100644
--- a/pkgs/development/compilers/jdk/default-1.4.nix
+++ b/pkgs/development/compilers/jdk/default-1.4.nix
@@ -6,4 +6,4 @@ if stdenv.system == "i686-linux"
       inherit stdenv fetchurl;
     }
   else
-    false
+    abort "the Java 2 SDK is not supported on this platform"
diff --git a/pkgs/development/compilers/jdk/default.nix b/pkgs/development/compilers/jdk/default.nix
index fd5aea133d66..bec80cda258f 100644
--- a/pkgs/development/compilers/jdk/default.nix
+++ b/pkgs/development/compilers/jdk/default.nix
@@ -4,7 +4,7 @@ if args.stdenv.system == "i686-linux" || args.stdenv.system == "x86_64-linux" th
   (import ./jdk6-linux.nix) args
 
 else if args.stdenv.system == "powerpc-linux"  then
- (import ./jdk5-ibm-powerpc-linux.nix) args
+  (import ./jdk5-ibm-powerpc-linux.nix) args
 
 else
-  false
+  abort "the JDK is not supported on this platform"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1d18ac7f265..2095041d77ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -753,10 +753,11 @@ rec {
     inherit fetchurl stdenv ghc;
   };
 
-  j2sdk14x = import ../development/compilers/jdk/default-1.4.nix {
-    inherit fetchurl stdenv;
-  };
-
+  j2sdk14x =
+    assert system == "i686-linux";
+    import ../development/compilers/jdk/default-1.4.nix {
+      inherit fetchurl stdenv;
+    };
 
   jdk       = jdkdistro true  false;
   jre       = jdkdistro false false;
@@ -764,10 +765,11 @@ rec {
   jdkPlugin = jdkdistro true true;
   jrePlugin = jdkdistro false true;
 
-  jdkdistro = installjdk : pluginSupport:
+  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";
       import ../development/compilers/jdk {
         inherit fetchurl stdenv unzip installjdk xlibs pluginSupport;
         libstdcpp5 = gcc33.gcc;