public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: JAVA_HOME may not always be defined

Browse Source
This commit is contained in:
John Ericson
2019-11-01 15:30:09 -04:00
parent 45e5e68c53
commit 373236ccff
15 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/graalvm/default.nix
View File

@@ -270,7 +270,7 @@ in rec {
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
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
'';
postFixup = openjdk.postFixup or null;

2
pkgs/development/compilers/graalvm/enterprise-edition.nix
View File

@@ -72,7 +72,7 @@ let
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
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
'';