Commit 8204a95e authored by Sandro Jäckel's avatar Sandro Jäckel Committed by Anderson Torres
Browse files

openjdk: bootstrap headless variant with headless openjdk 

This makes bootstrapping work when environment.noXlibs is set to true
parent 579ac201

pkgs/development/compilers/openjdk/11.nix

+6 −3
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ let 
  update = "18";

  build = "10";



  # 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}.${minor}.${update}+${build}";
@@ -29,7 +32,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-bootstrap

      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap

    ] ++ lib.optionals (!headless && enableGnome2) [

      gtk3 gnome_vfs GConf glib

    ];
@@ -58,7 +61,7 @@ let 
    '';



    configureFlags = [

      "--with-boot-jdk=${openjdk11-bootstrap.home}"

      "--with-boot-jdk=${openjdk-bootstrap.home}"

      "--with-version-pre="

      "--enable-unlimited-crypto"

      "--with-native-debug-symbols=internal"
@@ -155,7 +158,7 @@ let 
      done

    '';



    disallowedReferences = [ openjdk11-bootstrap ];

    disallowedReferences = [ openjdk-bootstrap ];



    meta = import ./meta.nix lib version;

pkgs/development/compilers/openjdk/12.nix

+7 −4
Original line number Diff line number Diff line 
{ 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;

pkgs/development/compilers/openjdk/13.nix

+6 −3
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ let 
  update = ".0.2";

  build = "-ga";



  # when building a headless jdk, also bootstrap it with a headless jdk

  openjdk-bootstrap = openjdk13-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 openjdk13-bootstrap

      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=${openjdk13-bootstrap.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 = [ openjdk13-bootstrap ];

    disallowedReferences = [ openjdk-bootstrap ];



    meta = import ./meta.nix lib version;

pkgs/development/compilers/openjdk/14.nix

+6 −3
Original line number Diff line number Diff line
@@ -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;

pkgs/development/compilers/openjdk/15.nix

+6 −3
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ let 
    __toString = self: "${self.major}${self.update}${self.build}";

  };



  # when building a headless jdk, also bootstrap it with a headless jdk

  openjdk-bootstrap = openjdk15-bootstrap.override { gtkSupport = !headless; };



  openjdk = stdenv.mkDerivation {

    pname = "openjdk" + lib.optionalString headless "-headless";

    inherit version;
@@ -29,7 +32,7 @@ let 
    buildInputs = [

      cpio perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib

      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst

      libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap

      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap

    ] ++ lib.optionals (!headless && enableGnome2) [

      gtk3 gnome_vfs GConf glib

    ];
@@ -57,7 +60,7 @@ let 
    '';



    configureFlags = [

      "--with-boot-jdk=${openjdk15-bootstrap.home}"

      "--with-boot-jdk=${openjdk-bootstrap.home}"

      "--with-version-pre="

      "--enable-unlimited-crypto"

      "--with-native-debug-symbols=internal"
@@ -150,7 +153,7 @@ let 
      done

    '';



    disallowedReferences = [ openjdk15-bootstrap ];

    disallowedReferences = [ openjdk-bootstrap ];



    pos = builtins.unsafeGetAttrPos "major" version;

    meta = import ./meta.nix lib version.major;