diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2014-01-15 16:32:40 +0100 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2014-01-15 16:32:40 +0100 |
| commit | b9cbab922e02c5d5ffafd71ffc8a677186141868 (patch) | |
| tree | 4d82dd67eb6f225f5f612725428210cbd6896b2b /pkgs/development/mobile | |
| parent | 512a3a4e463e154189a169e93a66d23a06effc6d (diff) | |
| download | nixpkgs-b9cbab922e02c5d5ffafd71ffc8a677186141868.tar nixpkgs-b9cbab922e02c5d5ffafd71ffc8a677186141868.tar.gz nixpkgs-b9cbab922e02c5d5ffafd71ffc8a677186141868.tar.bz2 nixpkgs-b9cbab922e02c5d5ffafd71ffc8a677186141868.tar.lz nixpkgs-b9cbab922e02c5d5ffafd71ffc8a677186141868.tar.xz nixpkgs-b9cbab922e02c5d5ffafd71ffc8a677186141868.tar.zst nixpkgs-b9cbab922e02c5d5ffafd71ffc8a677186141868.zip | |
Fix building with recent openjdk
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/build-app.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/titaniumsdk.nix | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 620b6f994a2..068a9acedda 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation { buildInputs = [ jdk ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; - JAVA_HOME = jdk; - buildPhase = '' export HOME=$TMPDIR diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix index 520e93c828b..abf06a00fc9 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { import os, sys os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)' - os.environ['JAVA_HOME'] = '${jdk}' + os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}' os.execv('$(pwd)/.builder.py', sys.argv) EOF |