diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2007-03-28 18:55:57 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2007-03-28 18:55:57 +0000 |
| commit | 705e87fe0f479b06e2a1de88c683d0a7d8277427 (patch) | |
| tree | b2b97092c2bf069ee40e1f900762972e3c2e514d /pkgs/top-level/all-packages.nix | |
| parent | 753eae47d10f4eb3632b58077f62c6655e024d6d (diff) | |
| download | nixpkgs-705e87fe0f479b06e2a1de88c683d0a7d8277427.tar nixpkgs-705e87fe0f479b06e2a1de88c683d0a7d8277427.tar.gz nixpkgs-705e87fe0f479b06e2a1de88c683d0a7d8277427.tar.bz2 nixpkgs-705e87fe0f479b06e2a1de88c683d0a7d8277427.tar.lz nixpkgs-705e87fe0f479b06e2a1de88c683d0a7d8277427.tar.xz nixpkgs-705e87fe0f479b06e2a1de88c683d0a7d8277427.tar.zst nixpkgs-705e87fe0f479b06e2a1de88c683d0a7d8277427.zip | |
jre: by default don't support the plugin
svn path=/nixpkgs/trunk/; revision=8461
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f1fb0206a7..3defbda5a12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -749,9 +749,11 @@ rec { }; - jdk = jdkdistro true false; - jre = jdkdistro false true; + jdk = jdkdistro true false; + jre = jdkdistro false false; + jdkPlugin = jdkdistro true true; + jrePlugin = jdkdistro false true; jdkdistro = installjdk : pluginSupport: if stdenv.isDarwin then @@ -2972,7 +2974,7 @@ rec { ] # RealPlayer is disabled by default for legal reasons. ++ (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 { |