summary refs log tree commit diff
path: root/pkgs/system/all-packages-generic.nix
diff options
context:
space:
mode:
authorRoy van den Broek <rbroek@cs.uu.nl>2005-10-04 15:01:38 +0000
committerRoy van den Broek <rbroek@cs.uu.nl>2005-10-04 15:01:38 +0000
commitd95b8c1db3f7d6f1133995b2ddf27bfe8acc93a6 (patch)
treeda6db1b27949f7e8574e9e7df7a6987fd6a07164 /pkgs/system/all-packages-generic.nix
parent1ec2b9d94ff318e63f098fe7d2fb4621778f29ec (diff)
downloadnixpkgs-d95b8c1db3f7d6f1133995b2ddf27bfe8acc93a6.tar
nixpkgs-d95b8c1db3f7d6f1133995b2ddf27bfe8acc93a6.tar.gz
nixpkgs-d95b8c1db3f7d6f1133995b2ddf27bfe8acc93a6.tar.bz2
nixpkgs-d95b8c1db3f7d6f1133995b2ddf27bfe8acc93a6.tar.lz
nixpkgs-d95b8c1db3f7d6f1133995b2ddf27bfe8acc93a6.tar.xz
nixpkgs-d95b8c1db3f7d6f1133995b2ddf27bfe8acc93a6.tar.zst
nixpkgs-d95b8c1db3f7d6f1133995b2ddf27bfe8acc93a6.zip
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
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
-rw-r--r--pkgs/system/all-packages-generic.nix10
1 files 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;