diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-09 12:50:38 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-09 12:50:38 +0100 |
| commit | 4775dee8b9bca7382240935e5cef219c28b8cf0b (patch) | |
| tree | ed424118ba0498368ba5c61bdf31dad85b68e584 /pkgs | |
| parent | 4e29062fbcecf2ac3e7c146cd3b458c1e0eb57ef (diff) | |
| download | nixlib-4775dee8b9bca7382240935e5cef219c28b8cf0b.tar nixlib-4775dee8b9bca7382240935e5cef219c28b8cf0b.tar.gz nixlib-4775dee8b9bca7382240935e5cef219c28b8cf0b.tar.bz2 nixlib-4775dee8b9bca7382240935e5cef219c28b8cf0b.tar.lz nixlib-4775dee8b9bca7382240935e5cef219c28b8cf0b.tar.xz nixlib-4775dee8b9bca7382240935e5cef219c28b8cf0b.tar.zst nixlib-4775dee8b9bca7382240935e5cef219c28b8cf0b.zip | |
openjdk: Set JAVA_HOME in a setup-hook
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 234f294eff3e..b99139c0e3fe 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/openjdk/bin $out/bin ln -s $jre/lib/openjdk/jre/bin $jre/bin - ''; + ''; # */ # FIXME: this is unnecessary once the multiple-outputs branch is merged. preFixup = '' @@ -117,6 +117,12 @@ stdenv.mkDerivation rec { # properly. mkdir -p $jre/nix-support echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + + # 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 + EOF ''; meta = { |