gd: propagate image format dependencies

After f8bdd7969d it has become necessary for users
of gd to also add inputs for optional image format support, such as libjpeg and
libwebp.

This patch makes the following commits obsolete:
- 972c438c03
- 2113b7389a
- 94286527ac
- a371094f1f
- f345d01974
This commit is contained in:
Joachim Fasting 2016-06-02 19:06:34 +02:00
parent 3a7ec4c8f4
commit 8b2fc35987
No known key found for this signature in database
GPG Key ID: 4330820E1E04DCF4

View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl { stdenv, fetchurl
, pkgconfig , pkgconfig
, zlib , zlib
, libjpeg
, libpng , libpng
, libwebp , libjpeg ? null
, libwebp ? null
, libtiff ? null , libtiff ? null
, libXpm ? null , libXpm ? null
, fontconfig , fontconfig
@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib fontconfig freetype libjpeg libpng libwebp libtiff libXpm ]; buildInputs = [ zlib fontconfig freetype ];
propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ];
outputs = [ "dev" "out" "bin" ]; outputs = [ "dev" "out" "bin" ];