public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gd: fix "Error: Problem doing text layout" 

This backport allows the Wayland documentation to be successfully
built.
This commit is contained in:
Alyssa Ross 2020-07-03 03:10:03 +00:00
parent 57f3c834bc
commit 10ad3f66f5
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/gd/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl { stdenv, fetchurl, fetchpatch
, pkgconfig , autoconf
, automake
, pkg-config
, zlib , zlib
, libpng , libpng
, libjpeg ? null , libjpeg ? null
@ -20,11 +22,24 @@ stdenv.mkDerivation rec {
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
patches = [
# Fixes an issue where some other packages would fail to build
# their documentation with an error like:
# "Error: Problem doing text layout"
#
# Can be removed if Wayland can still be built successfully with
# documentation.
(fetchpatch {
url = "https://github.com/libgd/libgd/commit/3dd0e308cbd2c24fde2fc9e9b707181252a2de95.patch";
excludes = [ "tests/gdimagestringft/.gitignore" ];
sha256 = "12iqlanl9czig9d7c3rvizrigw2iacimnmimfcny392dv9iazhl1";
})
];
# -pthread gets passed to clang, causing warnings # -pthread gets passed to clang, causing warnings
configureFlags = stdenv.lib.optional stdenv.isDarwin "--enable-werror=no"; configureFlags = stdenv.lib.optional stdenv.isDarwin "--enable-werror=no";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoconf automake pkg-config ];
buildInputs = [ zlib fontconfig freetype ]; buildInputs = [ zlib fontconfig freetype ];
propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ]; propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ];

1
pkgs/top-level/all-packages.nix
View File

@ -11911,6 +11911,7 @@ in
gf2x = callPackage ../development/libraries/gf2x {}; gf2x = callPackage ../development/libraries/gf2x {};
gd = callPackage ../development/libraries/gd { gd = callPackage ../development/libraries/gd {
automake = automake115x;
libtiff = null; libtiff = null;
libXpm = null; libXpm = null;
}; };