From 02083734d1c6238e25ac2b23538201edeeac33c9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 18:48:01 +0000
Subject: [PATCH] Add openjre

svn path=/nixpkgs/trunk/; revision=28117
---
 pkgs/development/compilers/openjdk/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix                | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index a20a03ac3dd7..92a7942ab574 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -18,6 +18,7 @@
 , libXtst
 , libXi
 , cpio
+, jreOnly ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     ensureDir $out
-    cp -av build/*/j2sdk-image/* $out
+    cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f38c2c41c52..dd293993de02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2119,6 +2119,10 @@ let
 
   openjdk = callPackage ../development/compilers/openjdk { };
 
+  openjre = callPackage ../development/compilers/openjdk {
+    jreOnly = true;
+  };
+
   j2sdk14x = (
     assert system == "i686-linux";
     import ../development/compilers/jdk/default-1.4.nix {