Unverified Commit 353371d9 authored by ajs124's avatar ajs124 Committed by GitHub
Browse files

Merge pull request #179058 from YaaZ/master 

Use system Freetype and Harfbuzz for OpenJDK 11-17
parents d40fea9a 075d9144

pkgs/development/compilers/openjdk/11.nix

+4 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip

, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2

, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2

, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama

, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap

, setJavaClassPath
@@ -27,7 +27,7 @@ let 


    nativeBuildInputs = [ pkg-config autoconf unzip ];

    buildInputs = [

      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib

      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

    ] ++ lib.optionals (!headless && enableGnome2) [
@@ -54,6 +54,8 @@ let 
      "--with-version-pre="

      "--enable-unlimited-crypto"

      "--with-native-debug-symbols=internal"

      "--with-freetype=system"

      "--with-harfbuzz=system"

      "--with-libjpeg=system"

      "--with-giflib=system"

      "--with-libpng=system"

pkgs/development/compilers/openjdk/12.nix

+4 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip

, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2

, 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

, setJavaClassPath
@@ -24,7 +24,7 @@ let 


    nativeBuildInputs = [ pkg-config autoconf unzip ];

    buildInputs = [

      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib

      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

    ] ++ lib.optionals (!headless && enableGnome2) [
@@ -63,6 +63,8 @@ let 
      "--with-version-pre="

      "--enable-unlimited-crypto"

      "--with-native-debug-symbols=internal"

      "--with-freetype=system"

      "--with-harfbuzz=system"

      "--with-libjpeg=system"

      "--with-giflib=system"

      "--with-libpng=system"

pkgs/development/compilers/openjdk/13.nix

+4 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip

, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2

, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2

, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama

, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch

, setJavaClassPath
@@ -24,7 +24,7 @@ let 


    nativeBuildInputs = [ pkg-config autoconf unzip ];

    buildInputs = [

      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib

      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

    ] ++ lib.optionals (!headless && enableGnome2) [
@@ -63,6 +63,8 @@ let 
      "--with-version-pre="

      "--enable-unlimited-crypto"

      "--with-native-debug-symbols=internal"

      "--with-freetype=system"

      "--with-harfbuzz=system"

      "--with-libjpeg=system"

      "--with-giflib=system"

      "--with-libpng=system"

pkgs/development/compilers/openjdk/14.nix

+4 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip

, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2

, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2

, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama

, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap

, setJavaClassPath
@@ -24,7 +24,7 @@ let 


    nativeBuildInputs = [ pkg-config autoconf unzip ];

    buildInputs = [

      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib

      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

    ] ++ lib.optionals (!headless && enableGnome2) [
@@ -58,6 +58,8 @@ let 
      "--with-version-pre="

      "--enable-unlimited-crypto"

      "--with-native-debug-symbols=internal"

      "--with-freetype=system"

      "--with-harfbuzz=system"

      "--with-libjpeg=system"

      "--with-giflib=system"

      "--with-libpng=system"

pkgs/development/compilers/openjdk/15.nix

+4 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip

, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2

, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2

, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama

, libXcursor, libXrandr, fontconfig, openjdk15-bootstrap

, setJavaClassPath
@@ -24,7 +24,7 @@ let 


    nativeBuildInputs = [ pkg-config autoconf unzip zip file which ];

    buildInputs = [

      cpio perl zlib cups freetype alsa-lib libjpeg giflib

      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

    ] ++ lib.optionals (!headless && enableGnome2) [
@@ -58,6 +58,8 @@ let 
      "--with-version-pre="

      "--enable-unlimited-crypto"

      "--with-native-debug-symbols=internal"

      "--with-freetype=system"

      "--with-harfbuzz=system"

      "--with-libjpeg=system"

      "--with-giflib=system"

      "--with-libpng=system"