3
0
Fork 0
forked from mirrors/nixpkgs

Add coreutils dependency to ant launcher script

Closes #4106.
This commit is contained in:
Daniel Peebles 2014-09-15 22:25:14 -04:00 committed by Mateusz Kowalczyk
parent b079eef310
commit 44ca1a7f57

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, makeWrapper }:
{ fetchurl, stdenv, coreutils, makeWrapper }:
let version = "1.9.4"; in
@ -43,7 +43,7 @@ stdenv.mkDerivation {
if [ -z "\$JAVA_HOME" ]; then
for i in javac java gij; do
if p="\$(type -p \$i)"; then
export JAVA_HOME="\$(dirname \$(dirname \$(readlink -f \$p)))"
export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))"
break
fi
done