From c82410eeda78deb3afe898168700772d53361985 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 Jan 2015 15:49:20 -0800
Subject: java: Normalize to the default jre / jdk

---
 pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix')

diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
index c8fbb435f306..aba5ab0f6970 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
     import os, sys
     
     os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
-    os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}'
+    os.environ['JAVA_HOME'] = '${jdk.home}'
     
     os.execv('$(pwd)/.builder.py', sys.argv)
     EOF
-- 
cgit 1.4.1