From c056a69fdda8308ce1fb7548aab0350ea40fad2e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 15 Jan 2014 01:06:04 -0500 Subject: [PATCH] darwin openjdk: set jre attribute. Fixes tarball Signed-off-by: Shea Levy --- .../compilers/openjdk-darwin/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index 1e74acfae72..ff9f12f8023 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -1,16 +1,19 @@ {stdenv, fetchurl, ...}: +let +jdk = stdenv.mkDerivation { + name = "openjdk6-b16-24_apr_2009-r1"; -stdenv.mkDerivation { - name = "openjdk6-b16-24_apr_2009-r1"; + src = fetchurl { + url = http://hg.bikemonkey.org/archive/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2; + sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v"; + }; + + installPhase = '' + mkdir -p $out + cp -vR * $out/ + ''; + + passthru.jre = jdk; - src = fetchurl { - url = http://hg.bikemonkey.org/archive/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2; - sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v"; }; - - installPhase = '' - mkdir -p $out - cp -vR * $out/ - ''; - -} +in jdk