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

Drop unnecessary setting of java.home

Browse Source
This commit is contained in:
Eelco Dolstra 2014-01-25 02:32:39 +01:00
parent 981cac8e10
commit 1b598da460
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/rascal/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'' ''
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${jdk}/bin/java $out/bin/rascal \ makeWrapper ${jdk}/bin/java $out/bin/rascal \
--add-flags "-Djava.home=$JAVA_HOME -jar ${src}" \ --add-flags "-jar ${src}" \
''; '';
meta = { meta = {

4
pkgs/development/tools/build-managers/apache-ant/default.nix
View File

@ -65,10 +65,6 @@ stdenv.mkDerivation {
LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" 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" \ exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \
-Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \ -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \
org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \ org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \