MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

jre: by default don't support the plugin

Browse source 
svn path=/nixpkgs/trunk/; revision=8461
This commit is contained in:
Martin Bravenboer 2007-03-28 18:55:57 +00:00
parent 753eae47d1
commit 705e87fe0f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -749,9 +749,11 @@ rec {
}; };
jdk = jdkdistro true false; jdk = jdkdistro true false;
jre = jdkdistro false true; jre = jdkdistro false false;
jdkPlugin = jdkdistro true true; jdkPlugin = jdkdistro true true;
jrePlugin = jdkdistro false true;
jdkdistro = installjdk : pluginSupport: jdkdistro = installjdk : pluginSupport:
if stdenv.isDarwin then if stdenv.isDarwin then
@ -2972,7 +2974,7 @@ rec {
] ]
# RealPlayer is disabled by default for legal reasons. # RealPlayer is disabled by default for legal reasons.
++ (if getConfig ["firefox" "enableRealPlayer"] false then [RealPlayer] else []) ++ (if getConfig ["firefox" "enableRealPlayer"] false then [RealPlayer] else [])
++ (if jre != false then [jre] else []); ++ (if jrePlugin != false then [jrePlugin] else []);
}; };
xara = import ../applications/graphics/xara { xara = import ../applications/graphics/xara {

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

@ -73,7 +73,7 @@ let {
jetty jetty
jikes jikes
jing_tools jing_tools
jre jrePlugin
kcachegrind kcachegrind
keen4 keen4
kernel kernel