* 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
This commit is contained in:
Eelco Dolstra
2007-04-16 10:07:06 +00:00
parent e317c7de41
commit 0005a37b8d
3 changed files with 10 additions and 8 deletions

View File

@@ -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"

View File

@@ -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"