diff options
Diffstat (limited to 'pkgs/development/compilers/openjdk/14.nix')
| -rw-r--r-- | pkgs/development/compilers/openjdk/14.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 07bded3676a..fb6c742fa5a 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -13,6 +13,9 @@ let update = ".0.2"; build = "-ga"; + # when building a headless jdk, also bootstrap it with a headless jdk + openjdk-bootstrap = openjdk14-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 openjdk14-bootstrap + libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; @@ -54,7 +57,7 @@ let ''; configureFlags = [ - "--with-boot-jdk=${openjdk14-bootstrap.home}" + "--with-boot-jdk=${openjdk-bootstrap.home}" "--with-version-pre=" "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" @@ -147,7 +150,7 @@ let done ''; - disallowedReferences = [ openjdk14-bootstrap ]; + disallowedReferences = [ openjdk-bootstrap ]; meta = import ./meta.nix lib version; |