mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
Fix building with recent openjdk
This commit is contained in:
parent
512a3a4e46
commit
b9cbab922e
@ -24,8 +24,6 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ jdk ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
|
||||
|
||||
JAVA_HOME = jdk;
|
||||
|
||||
buildPhase = ''
|
||||
export HOME=$TMPDIR
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user