From cda63e94c305ef94efc11f2e14f3a26bc19d73f6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Jan 2014 18:34:52 +0100 Subject: [PATCH] openjdk: Fix setting $JAVA_HOME --- pkgs/development/compilers/openjdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index b99139c0e3f..f29ab939964 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 < $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 '';