pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #179058 from YaaZ/master

Use system Freetype and Harfbuzz for OpenJDK 11-17

authored by

ajs124 and committed by
GitHub 353371d9 d40fea9a

+32 -16
unified split
+4 -2
pkgs/development/compilers/openjdk/11.nix
··· 1 1 { stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip 2 - , zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 2 + , zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 3 3 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama 4 4 , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap 5 5 , setJavaClassPath ··· 27 27 28 28 nativeBuildInputs = [ pkg-config autoconf unzip ]; 29 29 buildInputs = [ 30 - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib 30 + cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib 31 31 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst 32 32 libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap 33 33 ] ++ lib.optionals (!headless && enableGnome2) [ ··· 54 54 "--with-version-pre=" 55 55 "--enable-unlimited-crypto" 56 56 "--with-native-debug-symbols=internal" 57 + "--with-freetype=system" 58 + "--with-harfbuzz=system" 57 59 "--with-libjpeg=system" 58 60 "--with-giflib=system" 59 61 "--with-libpng=system"
+4 -2
pkgs/development/compilers/openjdk/12.nix
··· 1 1 { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip 2 - , zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 2 + , zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 3 3 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama 4 4 , libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch 5 5 , setJavaClassPath ··· 24 24 25 25 nativeBuildInputs = [ pkg-config autoconf unzip ]; 26 26 buildInputs = [ 27 - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib 27 + cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib 28 28 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst 29 29 libXi libXinerama libXcursor libXrandr fontconfig openjdk11 30 30 ] ++ lib.optionals (!headless && enableGnome2) [ ··· 63 63 "--with-version-pre=" 64 64 "--enable-unlimited-crypto" 65 65 "--with-native-debug-symbols=internal" 66 + "--with-freetype=system" 67 + "--with-harfbuzz=system" 66 68 "--with-libjpeg=system" 67 69 "--with-giflib=system" 68 70 "--with-libpng=system"
+4 -2
pkgs/development/compilers/openjdk/13.nix
··· 1 1 { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip 2 - , zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 2 + , zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 3 3 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama 4 4 , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch 5 5 , setJavaClassPath ··· 24 24 25 25 nativeBuildInputs = [ pkg-config autoconf unzip ]; 26 26 buildInputs = [ 27 - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib 27 + cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib 28 28 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst 29 29 libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap 30 30 ] ++ lib.optionals (!headless && enableGnome2) [ ··· 63 63 "--with-version-pre=" 64 64 "--enable-unlimited-crypto" 65 65 "--with-native-debug-symbols=internal" 66 + "--with-freetype=system" 67 + "--with-harfbuzz=system" 66 68 "--with-libjpeg=system" 67 69 "--with-giflib=system" 68 70 "--with-libpng=system"
+4 -2
pkgs/development/compilers/openjdk/14.nix
··· 1 1 { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip 2 - , zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 2 + , zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 3 3 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama 4 4 , libXcursor, libXrandr, fontconfig, openjdk14-bootstrap 5 5 , setJavaClassPath ··· 24 24 25 25 nativeBuildInputs = [ pkg-config autoconf unzip ]; 26 26 buildInputs = [ 27 - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib 27 + cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib 28 28 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst 29 29 libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap 30 30 ] ++ lib.optionals (!headless && enableGnome2) [ ··· 58 58 "--with-version-pre=" 59 59 "--enable-unlimited-crypto" 60 60 "--with-native-debug-symbols=internal" 61 + "--with-freetype=system" 62 + "--with-harfbuzz=system" 61 63 "--with-libjpeg=system" 62 64 "--with-giflib=system" 63 65 "--with-libpng=system"
+4 -2
pkgs/development/compilers/openjdk/15.nix
··· 1 1 { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip 2 - , zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 2 + , zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 3 3 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama 4 4 , libXcursor, libXrandr, fontconfig, openjdk15-bootstrap 5 5 , setJavaClassPath ··· 24 24 25 25 nativeBuildInputs = [ pkg-config autoconf unzip zip file which ]; 26 26 buildInputs = [ 27 - cpio perl zlib cups freetype alsa-lib libjpeg giflib 27 + cpio perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib 28 28 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst 29 29 libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap 30 30 ] ++ lib.optionals (!headless && enableGnome2) [ ··· 58 58 "--with-version-pre=" 59 59 "--enable-unlimited-crypto" 60 60 "--with-native-debug-symbols=internal" 61 + "--with-freetype=system" 62 + "--with-harfbuzz=system" 61 63 "--with-libjpeg=system" 62 64 "--with-giflib=system" 63 65 "--with-libpng=system"
+4 -2
pkgs/development/compilers/openjdk/16.nix
··· 1 1 { stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio 2 - , file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib 2 + , file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib 3 3 , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst 4 4 , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap 5 5 , setJavaClassPath ··· 28 28 29 29 nativeBuildInputs = [ pkg-config autoconf unzip ]; 30 30 buildInputs = [ 31 - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib 31 + cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib 32 32 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst 33 33 libXi libXinerama libXcursor libXrandr fontconfig openjdk16-bootstrap 34 34 ] ++ lib.optionals (!headless && enableGnome2) [ ··· 65 65 "--with-version-pre=" 66 66 "--enable-unlimited-crypto" 67 67 "--with-native-debug-symbols=internal" 68 + "--with-freetype=system" 69 + "--with-harfbuzz=system" 68 70 "--with-libjpeg=system" 69 71 "--with-giflib=system" 70 72 "--with-libpng=system"
+4 -2
pkgs/development/compilers/openjdk/17.nix
··· 1 1 { stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio 2 - , file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib 2 + , file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib 3 3 , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst 4 4 , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk17-bootstrap 5 5 , setJavaClassPath ··· 28 28 29 29 nativeBuildInputs = [ pkg-config autoconf unzip ]; 30 30 buildInputs = [ 31 - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib 31 + cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib 32 32 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst 33 33 libXi libXinerama libXcursor libXrandr fontconfig openjdk17-bootstrap 34 34 ] ++ lib.optionals (!headless && enableGnome2) [ ··· 74 74 "--with-version-pre=" 75 75 "--enable-unlimited-crypto" 76 76 "--with-native-debug-symbols=internal" 77 + "--with-freetype=system" 78 + "--with-harfbuzz=system" 77 79 "--with-libjpeg=system" 78 80 "--with-giflib=system" 79 81 "--with-libpng=system"
+4 -2
pkgs/development/compilers/openjdk/18.nix
··· 1 1 { stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio 2 - , file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib 2 + , file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib 3 3 , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst 4 4 , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk18-bootstrap 5 5 , setJavaClassPath ··· 27 27 28 28 nativeBuildInputs = [ pkg-config autoconf unzip ]; 29 29 buildInputs = [ 30 - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib 30 + cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib 31 31 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst 32 32 libXi libXinerama libXcursor libXrandr fontconfig openjdk18-bootstrap 33 33 ] ++ lib.optionals (!headless && enableGnome2) [ ··· 65 65 "--with-version-pre=" 66 66 "--enable-unlimited-crypto" 67 67 "--with-native-debug-symbols=internal" 68 + "--with-freetype=system" 69 + "--with-harfbuzz=system" 68 70 "--with-libjpeg=system" 69 71 "--with-giflib=system" 70 72 "--with-libpng=system"