diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-01 15:30:09 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-01 22:00:07 +0000 |
| commit | 373236ccfffe7053b1503a8992ddff7ebae3ed6f (patch) | |
| tree | acf758b7b12b95d4483ae2bf960640c7043aefaf /pkgs/development/tools/build-managers | |
| parent | 45e5e68c5352768b877c52e79536b4e95e3fb32e (diff) | |
| download | nixlib-373236ccfffe7053b1503a8992ddff7ebae3ed6f.tar nixlib-373236ccfffe7053b1503a8992ddff7ebae3ed6f.tar.gz nixlib-373236ccfffe7053b1503a8992ddff7ebae3ed6f.tar.bz2 nixlib-373236ccfffe7053b1503a8992ddff7ebae3ed6f.tar.lz nixlib-373236ccfffe7053b1503a8992ddff7ebae3ed6f.tar.xz nixlib-373236ccfffe7053b1503a8992ddff7ebae3ed6f.tar.zst nixlib-373236ccfffe7053b1503a8992ddff7ebae3ed6f.zip | |
treewide: JAVA_HOME may not always be defined
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/apache-ant/1.9.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/apache-ant/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 0a86aaeb6ca0..661e16d83e82 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation { # JRE by looking for java. The latter allows just the JRE to be # used with (say) ECJ as the compiler. Finally, allow the GNU # JVM. - if [ -z "\$JAVA_HOME" ]; then + if [ -z "\''${JAVA_HOME-}" ]; then for i in javac java gij; do if p="\$(type -p \$i)"; then export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))" break fi done - if [ -z "\$JAVA_HOME" ]; then + if [ -z "\''${JAVA_HOME-}" ]; then echo "\$0: cannot find the JDK or JRE" >&2 exit 1 fi diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 8d1e09eeb338..28e86e291755 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation { # JRE by looking for java. The latter allows just the JRE to be # used with (say) ECJ as the compiler. Finally, allow the GNU # JVM. - if [ -z "\$JAVA_HOME" ]; then + if [ -z "\''${JAVA_HOME-}" ]; then for i in javac java gij; do if p="\$(type -p \$i)"; then export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))" break fi done - if [ -z "\$JAVA_HOME" ]; then + if [ -z "\''${JAVA_HOME-}" ]; then echo "\$0: cannot find the JDK or JRE" >&2 exit 1 fi |