From d95b8c1db3f7d6f1133995b2ddf27bfe8acc93a6 Mon Sep 17 00:00:00 2001 From: Roy van den Broek Date: Tue, 4 Oct 2005 15:01:38 +0000 Subject: [PATCH] Nasty hack to let JDK 5.0 work on Mac OS X (assuming the user downloaded JDK from http://www.apple.com/support/downloads/java2se50release1.html). svn path=/nixpkgs/trunk/; revision=4012 --- pkgs/system/all-packages-generic.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 78b2e6b2100..9839878e0e1 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -501,9 +501,13 @@ rec { inherit fetchurl stdenv; }; - jdk = (import ../development/compilers/jdk) { - inherit fetchurl stdenv; - }; + jdk = + if stdenv.system == "powerpc-darwin" then + "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home" + else + (import ../development/compilers/jdk) { + inherit fetchurl stdenv; + }; j2sdk14x = (import ../development/compilers/jdk/default-1.4.nix) { inherit fetchurl stdenv;