diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2016-06-02 19:06:34 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-06-03 15:43:12 +0200 |
| commit | 8b2fc35987e62c079fd50980782495360039a9c1 (patch) | |
| tree | ca02a3537c3d017e8986da287deb5be61ce1bb64 /pkgs/development/libraries/gd | |
| parent | 3a7ec4c8f40680f63c3f3d9793c46065be1c1a49 (diff) | |
| download | nixpkgs-8b2fc35987e62c079fd50980782495360039a9c1.tar nixpkgs-8b2fc35987e62c079fd50980782495360039a9c1.tar.gz nixpkgs-8b2fc35987e62c079fd50980782495360039a9c1.tar.bz2 nixpkgs-8b2fc35987e62c079fd50980782495360039a9c1.tar.lz nixpkgs-8b2fc35987e62c079fd50980782495360039a9c1.tar.xz nixpkgs-8b2fc35987e62c079fd50980782495360039a9c1.tar.zst nixpkgs-8b2fc35987e62c079fd50980782495360039a9c1.zip | |
gd: propagate image format dependencies
After f8bdd7969d1af9b1f4ab5f968fae336190c1ae1c 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: - 972c438c03f046bddffea2a2ae349aaf6e652277 - 2113b7389afa040923e8e33443d3f5ce6eaed69e - 94286527ace1f7c3b09bf68e9449a1c8ecfcbd33 - a371094f1f0df1edf669362fe2612de10b077ca4 - f345d01974378d443e82cd615ee95620529beb1d
Diffstat (limited to 'pkgs/development/libraries/gd')
| -rw-r--r-- | pkgs/development/libraries/gd/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 5759aa46d13..7f7e000d16e 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl , pkgconfig , zlib -, libjpeg , libpng -, libwebp +, libjpeg ? null +, libwebp ? null , libtiff ? null , libXpm ? null , fontconfig @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { }; 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" ]; |