diff options
| author | Daniel Peebles <pumpkin@me.com> | 2014-09-15 22:25:14 -0400 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-09-17 03:54:25 +0100 |
| commit | 44ca1a7f573b06a6089c0882120f7f1e6eae19e3 (patch) | |
| tree | 375aeaf59abad156becd70c60caac7bf561c137c /pkgs | |
| parent | b079eef310aeb157b4bfb097ca8ed9ea0c7fd6d4 (diff) | |
| download | nixpkgs-44ca1a7f573b06a6089c0882120f7f1e6eae19e3.tar nixpkgs-44ca1a7f573b06a6089c0882120f7f1e6eae19e3.tar.gz nixpkgs-44ca1a7f573b06a6089c0882120f7f1e6eae19e3.tar.bz2 nixpkgs-44ca1a7f573b06a6089c0882120f7f1e6eae19e3.tar.lz nixpkgs-44ca1a7f573b06a6089c0882120f7f1e6eae19e3.tar.xz nixpkgs-44ca1a7f573b06a6089c0882120f7f1e6eae19e3.tar.zst nixpkgs-44ca1a7f573b06a6089c0882120f7f1e6eae19e3.zip | |
Add coreutils dependency to ant launcher script
Closes #4106.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/apache-ant/default.nix | 4 |
1 files 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 751b40e714e..476d2cb8ac5 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 |