public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use jdk without plugin support

Browse Source 
svn path=/nixpkgs/trunk/; revision=8454
This commit is contained in:
Martin Bravenboer 2007-03-28 15:31:00 +00:00
parent 9d9372cd58
commit 7ae637007b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -748,17 +748,17 @@ rec {
inherit fetchurl stdenv; 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: jdkdistro = installjdk : pluginSupport:
if stdenv.isDarwin then if stdenv.isDarwin then
"/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home" "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"
else else
import ../development/compilers/jdk { import ../development/compilers/jdk {
inherit fetchurl stdenv unzip installjdk xlibs; inherit fetchurl stdenv unzip installjdk xlibs pluginSupport;
libstdcpp5 = gcc33.gcc; libstdcpp5 = gcc33.gcc;
}; };

2
pkgs/top-level/build-for-release.nix
View File

@ -69,7 +69,7 @@ let {
hello hello
iputils iputils
jakartaregexp jakartaregexp
jdk jdkPlugin
jetty jetty
jikes jikes
jing_tools jing_tools