Merge pull request #140257 from Uthar/jdk17
This commit is contained in:
commit
eb7efbbdeb
162
pkgs/development/compilers/openjdk/17.nix
Normal file
162
pkgs/development/compilers/openjdk/17.nix
Normal file
@ -0,0 +1,162 @@
|
||||
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
|
||||
, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
|
||||
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
|
||||
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk17-bootstrap
|
||||
, setJavaClassPath
|
||||
, headless ? false
|
||||
, enableJavaFX ? openjfx.meta.available, openjfx
|
||||
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
|
||||
}:
|
||||
|
||||
let
|
||||
version = {
|
||||
feature = "17";
|
||||
interim = ".0.1";
|
||||
build = "12";
|
||||
};
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${version.feature}${version.interim}+${version.build}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openjdk";
|
||||
repo = "jdk${version.feature}u";
|
||||
rev = "jdk-${version.feature}${version.interim}+${version.build}";
|
||||
sha256 = "1l1jgbz8q7zq66npfg88r0l5xga427vrz35iys09j44b6qllrldd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
||||
buildInputs = [
|
||||
cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk17-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
||||
patches = [
|
||||
./fix-java-home-jdk10.patch
|
||||
./read-truststore-from-env-jdk10.patch
|
||||
./currency-date-range-jdk10.patch
|
||||
./increase-javadoc-heap-jdk13.patch
|
||||
./ignore-LegalNoticeFilePlugin.patch
|
||||
|
||||
# -Wformat etc. are stricter in newer gccs, per
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
|
||||
# so grab the work-around from
|
||||
# https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
|
||||
(fetchurl {
|
||||
url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
|
||||
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
|
||||
})
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
./swing-use-gtk-jdk13.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x configure
|
||||
patchShebangs --build configure
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk17-bootstrap.home}"
|
||||
"--with-version-build=${version.build}"
|
||||
"--with-version-opt=nixos"
|
||||
"--with-version-pre="
|
||||
"--enable-unlimited-crypto"
|
||||
"--with-native-debug-symbols=internal"
|
||||
"--with-libjpeg=system"
|
||||
"--with-giflib=system"
|
||||
"--with-libpng=system"
|
||||
"--with-zlib=system"
|
||||
"--with-lcms=system"
|
||||
"--with-stdc++lib=dynamic"
|
||||
] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
|
||||
++ lib.optional headless "--enable-headless-only"
|
||||
++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
NIX_LDFLAGS = toString (lib.optionals (!headless) [
|
||||
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
|
||||
]);
|
||||
|
||||
buildFlags = [ "images" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
|
||||
mv build/*/images/jdk $out/lib/openjdk
|
||||
|
||||
# Remove some broken manpages.
|
||||
rm -rf $out/lib/openjdk/man/ja*
|
||||
|
||||
# Mirror some stuff in top-level.
|
||||
mkdir -p $out/share
|
||||
ln -s $out/lib/openjdk/include $out/include
|
||||
ln -s $out/lib/openjdk/man $out/share/man
|
||||
|
||||
# IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
|
||||
ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
|
||||
|
||||
# jni.h expects jni_md.h to be in the header search path.
|
||||
ln -s $out/include/linux/*_md.h $out/include/
|
||||
|
||||
# Remove crap from the installation.
|
||||
rm -rf $out/lib/openjdk/demo
|
||||
${lib.optionalString headless ''
|
||||
rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
|
||||
''}
|
||||
|
||||
ln -s $out/lib/openjdk/bin $out/bin
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# Propagate the setJavaClassPath setup hook so that any package
|
||||
# that depends on the JDK has $CLASSPATH set up properly.
|
||||
mkdir -p $out/nix-support
|
||||
#TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
|
||||
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
|
||||
|
||||
# Set JAVA_HOME automatically.
|
||||
mkdir -p $out/nix-support
|
||||
cat <<EOF > $out/nix-support/setup-hook
|
||||
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
|
||||
EOF
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Build the set of output library directories to rpath against
|
||||
LIBDIRS=""
|
||||
for output in $outputs; do
|
||||
if [ "$output" = debug ]; then continue; fi
|
||||
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
|
||||
done
|
||||
# Add the local library paths to remove dependencies on the bootstrap
|
||||
for output in $outputs; do
|
||||
if [ "$output" = debug ]; then continue; fi
|
||||
OUTPUTDIR=$(eval echo \$$output)
|
||||
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
|
||||
echo "$BINLIBS" | while read i; do
|
||||
patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
|
||||
patchelf --shrink-rpath "$i" || true
|
||||
done
|
||||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk17-bootstrap ];
|
||||
|
||||
meta = import ./meta.nix lib;
|
||||
|
||||
passthru = {
|
||||
architecture = "";
|
||||
home = "${openjdk}/lib/openjdk";
|
||||
inherit gtk3;
|
||||
};
|
||||
};
|
||||
in openjdk
|
@ -0,0 +1,21 @@
|
||||
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java
|
||||
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java
|
||||
@@ -112,18 +112,6 @@
|
||||
.filter(e -> Arrays.equals(e.contentBytes(), entry.contentBytes()))
|
||||
.findFirst();
|
||||
if (!otarget.isPresent()) {
|
||||
- if (errorIfNotSameContent) {
|
||||
- // all legal notices of the same file name are expected
|
||||
- // to contain the same content
|
||||
- Optional<ResourcePoolEntry> ores =
|
||||
- entries.stream().filter(e -> e.linkedTarget() == null)
|
||||
- .findAny();
|
||||
-
|
||||
- if (ores.isPresent()) {
|
||||
- throw new PluginException(ores.get().path() + " " +
|
||||
- entry.path() + " contain different content");
|
||||
- }
|
||||
- }
|
||||
entries.add(entry);
|
||||
} else {
|
||||
entries.add(ResourcePoolEntry.createSymLink(entry.path(),
|
@ -5,7 +5,7 @@
|
||||
, pkgs
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, openjdk16
|
||||
, jdk
|
||||
, nodejs
|
||||
, pathDeps ? [ ]
|
||||
}:
|
||||
|
@ -12037,7 +12037,6 @@ with pkgs;
|
||||
else
|
||||
callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
|
||||
|
||||
/* currently maintained LTS JDK */
|
||||
openjdk11 =
|
||||
if stdenv.isDarwin then
|
||||
callPackage ../development/compilers/openjdk/darwin/11.nix { }
|
||||
@ -12053,12 +12052,17 @@ with pkgs;
|
||||
else
|
||||
openjdk11.override { headless = true; };
|
||||
|
||||
openjdk16-bootstrap =
|
||||
if adoptopenjdk-hotspot-bin-15.meta.available then
|
||||
adoptopenjdk-hotspot-bin-15
|
||||
openjdk17-bootstrap =
|
||||
if adoptopenjdk-hotspot-bin-16.meta.available then
|
||||
adoptopenjdk-hotspot-bin-16
|
||||
else
|
||||
/* adoptopenjdk not available for i686, so fall back to our old builds of 12, 13, & 14 for bootstrapping */
|
||||
callPackage ../development/compilers/openjdk/15.nix {
|
||||
/* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */
|
||||
callPackage ../development/compilers/openjdk/16.nix {
|
||||
openjfx = openjfx11; /* need this despite next line :-( */
|
||||
enableJavaFX = false;
|
||||
headless = true;
|
||||
inherit (gnome2) GConf gnome_vfs;
|
||||
openjdk16-bootstrap = callPackage ../development/compilers/openjdk/15.nix {
|
||||
openjfx = openjfx11; /* need this despite next line :-( */
|
||||
enableJavaFX = false;
|
||||
headless = true;
|
||||
@ -12083,32 +12087,32 @@ with pkgs;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
jdk11 = openjdk11;
|
||||
jdk11_headless = openjdk11_headless;
|
||||
|
||||
/* Latest JDK */
|
||||
openjdk16 =
|
||||
openjdk17 =
|
||||
if stdenv.isDarwin then
|
||||
callPackage ../development/compilers/openjdk/darwin { }
|
||||
else
|
||||
callPackage ../development/compilers/openjdk/16.nix {
|
||||
callPackage ../development/compilers/openjdk/17.nix {
|
||||
openjfx = openjfx15;
|
||||
inherit (gnome2) GConf gnome_vfs;
|
||||
};
|
||||
|
||||
openjdk16_headless =
|
||||
openjdk17_headless =
|
||||
if stdenv.isDarwin then
|
||||
openjdk16
|
||||
openjdk17
|
||||
else
|
||||
openjdk16.override { headless = true; };
|
||||
openjdk17.override { headless = true; };
|
||||
|
||||
jdk16 = openjdk16;
|
||||
jdk16_headless = openjdk16_headless;
|
||||
jdk17 = openjdk17;
|
||||
jdk17_headless = openjdk17_headless;
|
||||
|
||||
/* default JDK */
|
||||
|
||||
jdk = jdk16;
|
||||
jdk = jdk17;
|
||||
|
||||
# Since the introduction of the Java Platform Module System in Java 9, Java
|
||||
# no longer ships a separate JRE package.
|
||||
@ -12117,13 +12121,13 @@ with pkgs;
|
||||
# 'jre_minimal' to build a bespoke JRE containing only the modules you need.
|
||||
#
|
||||
# For a general-purpose system, 'jre' defaults to the full JDK:
|
||||
jre = jdk16;
|
||||
jre_headless = jdk16_headless;
|
||||
jre = jdk17;
|
||||
jre_headless = jdk17_headless;
|
||||
|
||||
jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { };
|
||||
|
||||
openjdk = openjdk16;
|
||||
openjdk_headless = openjdk16_headless;
|
||||
openjdk = openjdk17;
|
||||
openjdk_headless = openjdk17_headless;
|
||||
|
||||
graalvmCEPackages =
|
||||
recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition {
|
||||
|
Loading…
Reference in New Issue
Block a user