MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

oraclejdk: Export the same setup hooks as openjdk

Browse source
This commit is contained in:
Eelco Dolstra 2014-07-16 18:23:47 +02:00
parent 3c58261c67
commit c39bee0c0f
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/compilers/jdk/jdk-linux-base.nix
View file

@ -30,6 +30,7 @@
, alsaLib , alsaLib
, atk , atk
, gdk_pixbuf , gdk_pixbuf
, setJavaClassPath
}: }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@ -59,7 +60,7 @@ let
""; "";
in in
stdenv.mkDerivation rec { let result = stdenv.mkDerivation rec {
name = name =
if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}"; if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}";
@ -156,6 +157,14 @@ stdenv.mkDerivation rec {
mkdir $jrePath/lib/${architecture}/plugins mkdir $jrePath/lib/${architecture}/plugins
ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
mkdir -p $out/nix-support
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF
''; '';
inherit installjdk pluginSupport; inherit installjdk pluginSupport;
@ -169,5 +178,8 @@ stdenv.mkDerivation rec {
passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
meta.license = "unfree"; meta.license = "unfree";
}
}; in result