Drop unnecessary setting of java.home
This commit is contained in:
parent
981cac8e10
commit
1b598da460
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${jdk}/bin/java $out/bin/rascal \
|
||||
--add-flags "-Djava.home=$JAVA_HOME -jar ${src}" \
|
||||
--add-flags "-jar ${src}" \
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -65,10 +65,6 @@ stdenv.mkDerivation {
|
||||
|
||||
LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
|
||||
|
||||
if [ -e \$JAVA_HOME/lib/tools.jar ]; then
|
||||
LOCALCLASSPATH="\$JAVA_HOME/lib/tools.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
|
||||
fi
|
||||
|
||||
exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \
|
||||
-Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \
|
||||
org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \
|
||||
|
Loading…
Reference in New Issue
Block a user