cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

openjdk: use system Freetype and Harfbuzz

Browse source 
This is needed to avoid duplicate symbols from bundled/system libfontmanager.so and libharfbuzz.so, because this duplication leads to crashes.
This commit is contained in:
Nikita Gubarkov 2022-06-25 21:36:37 +03:00
parent 06e2c42ae4
commit 075d9144f8
8 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/openjdk/11.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip { 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 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
, setJavaClassPath , setJavaClassPath
@ -27,7 +27,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [
@ -54,6 +54,8 @@ let
"--with-version-pre=" "--with-version-pre="
"--enable-unlimited-crypto" "--enable-unlimited-crypto"
"--with-native-debug-symbols=internal" "--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system" "--with-libjpeg=system"
"--with-giflib=system" "--with-giflib=system"
"--with-libpng=system" "--with-libpng=system"

6
pkgs/development/compilers/openjdk/12.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip { 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 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch , libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch
, setJavaClassPath , setJavaClassPath
@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11 libXi libXinerama libXcursor libXrandr fontconfig openjdk11
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [
@ -63,6 +63,8 @@ let
"--with-version-pre=" "--with-version-pre="
"--enable-unlimited-crypto" "--enable-unlimited-crypto"
"--with-native-debug-symbols=internal" "--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system" "--with-libjpeg=system"
"--with-giflib=system" "--with-giflib=system"
"--with-libpng=system" "--with-libpng=system"

6
pkgs/development/compilers/openjdk/13.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip { 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 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch
, setJavaClassPath , setJavaClassPath
@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [
@ -63,6 +63,8 @@ let
"--with-version-pre=" "--with-version-pre="
"--enable-unlimited-crypto" "--enable-unlimited-crypto"
"--with-native-debug-symbols=internal" "--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system" "--with-libjpeg=system"
"--with-giflib=system" "--with-giflib=system"
"--with-libpng=system" "--with-libpng=system"

6
pkgs/development/compilers/openjdk/14.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip { 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 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , libXcursor, libXrandr, fontconfig, openjdk14-bootstrap
, setJavaClassPath , setJavaClassPath
@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [
@ -58,6 +58,8 @@ let
"--with-version-pre=" "--with-version-pre="
"--enable-unlimited-crypto" "--enable-unlimited-crypto"
"--with-native-debug-symbols=internal" "--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system" "--with-libjpeg=system"
"--with-giflib=system" "--with-giflib=system"
"--with-libpng=system" "--with-libpng=system"

6
pkgs/development/compilers/openjdk/15.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip { 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 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk15-bootstrap , libXcursor, libXrandr, fontconfig, openjdk15-bootstrap
, setJavaClassPath , setJavaClassPath
@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip zip file which ]; nativeBuildInputs = [ pkg-config autoconf unzip zip file which ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [
@ -58,6 +58,8 @@ let
"--with-version-pre=" "--with-version-pre="
"--enable-unlimited-crypto" "--enable-unlimited-crypto"
"--with-native-debug-symbols=internal" "--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system" "--with-libjpeg=system"
"--with-giflib=system" "--with-giflib=system"
"--with-libpng=system" "--with-libpng=system"

6
pkgs/development/compilers/openjdk/16.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio { stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib , file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap
, setJavaClassPath , setJavaClassPath
@ -28,7 +28,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk16-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk16-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [
@ -65,6 +65,8 @@ let
"--with-version-pre=" "--with-version-pre="
"--enable-unlimited-crypto" "--enable-unlimited-crypto"
"--with-native-debug-symbols=internal" "--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system" "--with-libjpeg=system"
"--with-giflib=system" "--with-giflib=system"
"--with-libpng=system" "--with-libpng=system"

6
pkgs/development/compilers/openjdk/17.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio { stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib , file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk17-bootstrap , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk17-bootstrap
, setJavaClassPath , setJavaClassPath
@ -28,7 +28,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk17-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk17-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [
@ -74,6 +74,8 @@ let
"--with-version-pre=" "--with-version-pre="
"--enable-unlimited-crypto" "--enable-unlimited-crypto"
"--with-native-debug-symbols=internal" "--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system" "--with-libjpeg=system"
"--with-giflib=system" "--with-giflib=system"
"--with-libpng=system" "--with-libpng=system"

6
pkgs/development/compilers/openjdk/18.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio { stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib , file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk18-bootstrap , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk18-bootstrap
, setJavaClassPath , setJavaClassPath
@ -27,7 +27,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk18-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk18-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [
@ -65,6 +65,8 @@ let
"--with-version-pre=" "--with-version-pre="
"--enable-unlimited-crypto" "--enable-unlimited-crypto"
"--with-native-debug-symbols=internal" "--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system" "--with-libjpeg=system"
"--with-giflib=system" "--with-giflib=system"
"--with-libpng=system" "--with-libpng=system"