treewide: JAVA_HOME may not always be defined

2019-11-01 15:30:09 -04:00
parent 45e5e68c53
commit 373236ccff
15 changed files with 17 additions and 17 deletions
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -156,7 +156,7 @@ let result = stdenv.mkDerivation rec {

    # Set JAVA_HOME automatically.
    cat <<EOF >> $out/nix-support/setup-hook
-    if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+    if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
    EOF
  '';