From 44ca1a7f573b06a6089c0882120f7f1e6eae19e3 Mon Sep 17 00:00:00 2001 From: Daniel Peebles Date: Mon, 15 Sep 2014 22:25:14 -0400 Subject: [PATCH] Add coreutils dependency to ant launcher script Closes #4106. --- pkgs/development/tools/build-managers/apache-ant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 751b40e714e8..476d2cb8ac52 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -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