@@ -2,7 +2,7 @@
22, IOCompress, zlib, libjpeg, expat, freetype, libwpd
33, libxml2, db, curl, fontconfig, libsndfile, neon
44, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
5−, icu, boost, jdk, ant, cups, xorg, fontforge
5+, icu, boost, jdk, ant, cups, xorg, fontforge, jre_minimal
66, openssl, gperf, cppunit, poppler, util-linux
77, librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
88, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
@@ -24,6 +24,10 @@
2424assert builtins.elem variant [ "fresh" "still" ];
2525
2626let
27+ jre' = jre_minimal.override {
28+ modules = [ "java.base" "java.desktop" ];
29+ };
30+
2731 importVariant = f: import (./. + "/src-${variant}/${f}");
2832
2933 primary-src = importVariant "primary.nix" { inherit fetchurl; };
@@ -318,7 +322,6 @@ in (mkDrv rec {
318322 "--enable-dbus"
319323 "--enable-release-build"
320324 "--enable-epm"
321− "--with-jdk-home=${jdk.home}"
322325 "--with-ant-home=${ant}/lib/ant"
323326 "--with-system-cairo"
324327 "--with-system-libs"
@@ -379,7 +382,7 @@ in (mkDrv rec {
379382 '';
380383
381384 nativeBuildInputs = [
382− gdb fontforge autoconf automake bison pkg-config libtool
385+ gdb fontforge autoconf automake bison pkg-config libtool jdk
383386 ] ++ lib.optional (!kdeIntegration) wrapGAppsHook
384387 ++ lib.optional kdeIntegration wrapQtAppsHook;
385388
@@ -387,7 +390,7 @@ in (mkDrv rec {
387390 [ ant ArchiveZip boost box2d cairo clucene_core
388391 IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
389392 freetype getopt gperf gtk3
390− hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
393+ hunspell icu jre' lcms libcdr libexttextcat unixODBC libjpeg
391394 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
392395 libXaw libXext libXi libXinerama libxml2 libxslt libXtst
393396 libXdmcp libpthreadstubs libGLU libGL mythes
@@ -407,7 +410,8 @@ in (mkDrv rec {
407410 ++ lib.optional kdeIntegration [ qtbase qtx11extras kcoreaddons kio ];
408411
409412 passthru = {
410− inherit srcs jdk;
413+ inherit srcs;
414+ jdk = jre';
411415 };
412416
413417 requiredSystemFeatures = [ "big-parallel" ];