public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix building with recent openjdk

Browse Source
This commit is contained in:
Sander van der Burg 2014-01-15 16:32:40 +01:00
parent 512a3a4e46
commit b9cbab922e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/mobile/titaniumenv/build-app.nix
View File

@ -24,8 +24,6 @@ stdenv.mkDerivation {
buildInputs = [ jdk ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildInputs = [ jdk ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
JAVA_HOME = jdk;
buildPhase = '' buildPhase = ''
export HOME=$TMPDIR export HOME=$TMPDIR

2
pkgs/development/mobile/titaniumenv/titaniumsdk.nix
View File

@ -62,7 +62,7 @@ stdenv.mkDerivation {
import os, sys import os, sys
os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)' 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) os.execv('$(pwd)/.builder.py', sys.argv)
EOF EOF