cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

openjdk10: minor cleanups

Browse source 
* with only one source bundle (per JEP-296), we can use src instead of
  srcs, and avoid the need to cd in prePatch

* fetch sources from jdk10u instead of jdk10, to make it easier to
  grab updates when they start coming.

* removed commented-out code that became irrelevant in the 8 -> 9
  transition (*.pf files, infinality font rendering)

* create jdk10, jre10, and jre10_headless attributes in
  all-packages.nix
This commit is contained in:
Matt McHenry 2018-03-25 20:14:55 -04:00
parent a0c525bd0a
commit aabf45c163
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/development/compilers/openjdk/10.nix
View file

@ -4,7 +4,6 @@
, libjpeg, giflib , libjpeg, giflib
, setJavaClassPath , setJavaClassPath
, minimal ? false , minimal ? false
#, enableInfinality ? true # font rendering patch
, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf , enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
}: }:
@ -20,18 +19,16 @@ let
update = "10"; update = "10";
build = "46"; build = "46";
baseurl = "http://hg.openjdk.java.net/jdk/jdk10";
repover = "jdk-${update}+${build}"; repover = "jdk-${update}+${build}";
paxflags = if stdenv.isi686 then "msp" else "m"; paxflags = if stdenv.isi686 then "msp" else "m";
jdk10 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz";
sha256 = "1n5jccf2rw15hzwppnvy87bysb84g3fcnkxbjhj8gi0iv79dxlc7";
};
openjdk10 = stdenv.mkDerivation { openjdk10 = stdenv.mkDerivation {
name = "openjdk-${update}-b${build}"; name = "openjdk-${update}-b${build}";
srcs = [ jdk10 ]; src = fetchurl {
sourceRoot = "."; url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz";
sha256 = "1a2cjad816qilsigkq035rqzfhzmq5vaz1klilrrws456flbsjlg";
};
outputs = [ "out" "jre" ]; outputs = [ "out" "jre" ];
@ -44,10 +41,6 @@ let
gtk2 gnome_vfs GConf glib gtk2 gnome_vfs GConf glib
]; ];
prePatch = ''
cd jdk10*
'';
patches = [ patches = [
./fix-java-home-jdk10.patch ./fix-java-home-jdk10.patch
./read-truststore-from-env-jdk10.patch ./read-truststore-from-env-jdk10.patch
@ -126,12 +119,6 @@ let
lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
# Make sure cmm/*.pf are not symlinks:
# https://youtrack.jetbrains.com/issue/IDEA-147272
# in 9, it seems no *.pf files end up in $out ... ?
# rm -rf $out/lib/openjdk/jre/lib/cmm
# ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
# Set PaX markings # Set PaX markings
exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
echo "to mark: *$exes*" echo "to mark: *$exes*"

14
pkgs/top-level/all-packages.nix
View file

@ -6423,6 +6423,20 @@ with pkgs;
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
jdk10 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };
jre10 = if stdenv.isArm || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
(openjdk10.jre // { outputs = [ "jre" ]; }));
jre10_headless =
if stdenv.isArm || stdenv.isAarch64 then
oraclejre10
else if stdenv.isDarwin then
jre10
else
lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless"
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
((openjdk10.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
jdk = jdk8; jdk = jdk8;
jre = jre8; jre = jre8;
jre_headless = jre8_headless; jre_headless = jre8_headless;