Use jdk without plugin support
svn path=/nixpkgs/trunk/; revision=8454
This commit is contained in:
parent
9d9372cd58
commit
7ae637007b
2 changed files with 5 additions and 5 deletions
|
@ -748,17 +748,17 @@ rec {
|
|||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
jre = jdkdistro false true;
|
||||
jdk = jdkdistro true true;
|
||||
|
||||
jdkNoPlugin = jdkdistro true false;
|
||||
jdk = jdkdistro true false;
|
||||
jre = jdkdistro false true;
|
||||
jdkPlugin = jdkdistro true true;
|
||||
|
||||
jdkdistro = installjdk : pluginSupport:
|
||||
if stdenv.isDarwin then
|
||||
"/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"
|
||||
else
|
||||
import ../development/compilers/jdk {
|
||||
inherit fetchurl stdenv unzip installjdk xlibs;
|
||||
inherit fetchurl stdenv unzip installjdk xlibs pluginSupport;
|
||||
libstdcpp5 = gcc33.gcc;
|
||||
};
|
||||
|
||||
|
|
|
@ -69,7 +69,7 @@ let {
|
|||
hello
|
||||
iputils
|
||||
jakartaregexp
|
||||
jdk
|
||||
jdkPlugin
|
||||
jetty
|
||||
jikes
|
||||
jing_tools
|
||||
|
|
Loading…
Reference in a new issue