about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-13 18:34:52 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-14 10:47:08 +0100
commitcda63e94c305ef94efc11f2e14f3a26bc19d73f6 (patch)
treeb67b3b82e2a43242163acad3eb793618d6a0bb04 /pkgs
parentb340508461811033a025da0b70191b195ab3c5f4 (diff)
downloadnixlib-cda63e94c305ef94efc11f2e14f3a26bc19d73f6.tar
nixlib-cda63e94c305ef94efc11f2e14f3a26bc19d73f6.tar.gz
nixlib-cda63e94c305ef94efc11f2e14f3a26bc19d73f6.tar.bz2
nixlib-cda63e94c305ef94efc11f2e14f3a26bc19d73f6.tar.lz
nixlib-cda63e94c305ef94efc11f2e14f3a26bc19d73f6.tar.xz
nixlib-cda63e94c305ef94efc11f2e14f3a26bc19d73f6.tar.zst
nixlib-cda63e94c305ef94efc11f2e14f3a26bc19d73f6.zip
openjdk: Fix setting $JAVA_HOME
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/openjdk/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index b99139c0e3fe..f29ab9399643 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
     # Set JAVA_HOME automatically.
     mkdir -p $out/nix-support
     cat <<EOF > $out/nix-support/setup-hook
-    if [ -n "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+    if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
     EOF
   '';