diff options
Diffstat (limited to 'pkgs/development/compilers/openjdk/12.nix')
| -rw-r--r-- | pkgs/development/compilers/openjdk/12.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 7f8ea2330b2..e717a910f70 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch +, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap, fetchpatch , setJavaClassPath , headless ? false , enableJavaFX ? false, openjfx @@ -13,6 +13,9 @@ let update = ".0.2"; build = "ga"; + # when building a headless jdk, also bootstrap it with a headless jdk + openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; }; + openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; version = "${major}${update}-${build}"; @@ -26,7 +29,7 @@ let buildInputs = [ cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk11 + libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; @@ -59,7 +62,7 @@ let ''; configureFlags = [ - "--with-boot-jdk=${openjdk11.home}" + "--with-boot-jdk=${openjdk-bootstrap.home}" "--with-version-pre=" "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" @@ -151,7 +154,7 @@ let done ''; - disallowedReferences = [ openjdk11 ]; + disallowedReferences = [ openjdk-bootstrap ]; meta = import ./meta.nix lib version; |