diff options
Diffstat (limited to 'pkgs/development/mobile/titaniumenv')
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix index 0fc6b7dca50..b46dcfb5b04 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix @@ -64,7 +64,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 diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix index b8f288131ed..beeb7fed995 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.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 diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix index 2d1cd049b14..13009265e07 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.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 diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix index c8fbb435f30..aba5ab0f697 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 |