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

openjdk: Set JAVA_HOME in a setup-hook

Browse Source
This commit is contained in:
Eelco Dolstra 2014-01-09 12:50:38 +01:00
parent 4e29062fbc
commit 4775dee8b9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/openjdk/default.nix
View File

@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
ln -s $out/lib/openjdk/bin $out/bin ln -s $out/lib/openjdk/bin $out/bin
ln -s $jre/lib/openjdk/jre/bin $jre/bin ln -s $jre/lib/openjdk/jre/bin $jre/bin
''; ''; # */
# FIXME: this is unnecessary once the multiple-outputs branch is merged. # FIXME: this is unnecessary once the multiple-outputs branch is merged.
preFixup = '' preFixup = ''
@ -117,6 +117,12 @@ stdenv.mkDerivation rec {
# properly. # properly.
mkdir -p $jre/nix-support mkdir -p $jre/nix-support
echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs 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 = { meta = {