From 1b598da460db965c9c4d68b711a9b671b2c5f887 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 25 Jan 2014 02:32:39 +0100 Subject: [PATCH] Drop unnecessary setting of java.home --- pkgs/development/interpreters/rascal/default.nix | 2 +- pkgs/development/tools/build-managers/apache-ant/default.nix | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index d3eb98249892..6818a996d623 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -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 = { diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 19c664c2ea7e..0dfb634c5944 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -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 \