summary refs log tree commit diff
path: root/pkgs/development/compilers/openjdk-darwin
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-15 11:51:07 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-15 11:51:07 +0200
commitcaa74a146da8ef2a6a314593989837fd80bbc27b (patch)
treea0b2de1816ffd8ed353fc44c32ccb02d5c59a3bd /pkgs/development/compilers/openjdk-darwin
parent828e386e6899aae29bb91a29f18cacf11206249e (diff)
downloadnixlib-caa74a146da8ef2a6a314593989837fd80bbc27b.tar
nixlib-caa74a146da8ef2a6a314593989837fd80bbc27b.tar.gz
nixlib-caa74a146da8ef2a6a314593989837fd80bbc27b.tar.bz2
nixlib-caa74a146da8ef2a6a314593989837fd80bbc27b.tar.lz
nixlib-caa74a146da8ef2a6a314593989837fd80bbc27b.tar.xz
nixlib-caa74a146da8ef2a6a314593989837fd80bbc27b.tar.zst
nixlib-caa74a146da8ef2a6a314593989837fd80bbc27b.zip
openjdk-darwin: Update to 7u60b30
Diffstat (limited to 'pkgs/development/compilers/openjdk-darwin')
-rw-r--r--pkgs/development/compilers/openjdk-darwin/default.nix14
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix
index 251b3868dd7f..fc8493d4cf35 100644
--- a/pkgs/development/compilers/openjdk-darwin/default.nix
+++ b/pkgs/development/compilers/openjdk-darwin/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, setJavaClassPath }:
+{ stdenv, fetchurl, unzip, setJavaClassPath }:
 let
   jdk = stdenv.mkDerivation {
-    name = "openjdk6-b16-24_apr_2009-r1";
+    name = "openjdk-7u60b30";
 
+    # From https://github.com/alexkasko/openjdk-unofficial-builds
     src = fetchurl {
-      url = http://landonf.bikemonkey.org/static/soylatte/bsd-dist/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2;
-      sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v";
+      url = https://bitbucket.org/alexkasko/openjdk-unofficial-builds/downloads/openjdk-1.7.0-u60-unofficial-macosx-x86_64-bundle.zip;
+      sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401";
     };
 
+    buildInputs = [ unzip ];
+
     installPhase = ''
-      mkdir -p $out
-      cp -vR * $out/
+      mv */Contents/Home $out
 
       # jni.h expects jni_md.h to be in the header search path.
       ln -s $out/include/darwin/*_md.h $out/include/