java: Normalize to the default jre / jdk

This commit is contained in:
William A. Kennington III
2015-01-01 15:49:20 -08:00
parent bbc4262514
commit c82410eeda
20 changed files with 36 additions and 42 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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