diff options
| author | Robin Gloster <mail@glob.in> | 2016-06-10 09:27:04 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-06-10 09:27:04 +0000 |
| commit | 8031cba2ab3146977141fc504bea2a1e03b5c126 (patch) | |
| tree | 0cd68c0007851dfed7d7f8247754b5c4b356704e /pkgs/development/libraries/gd/default.nix | |
| parent | 2a5e64b69c83592caf900cb0b7213235e96368de (diff) | |
| parent | 656c48f141be5886c515a1a874a47472cbbac6bd (diff) | |
| download | nixlib-8031cba2ab3146977141fc504bea2a1e03b5c126.tar nixlib-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.gz nixlib-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.bz2 nixlib-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.lz nixlib-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.xz nixlib-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.zst nixlib-8031cba2ab3146977141fc504bea2a1e03b5c126.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/libraries/gd/default.nix')
| -rw-r--r-- | pkgs/development/libraries/gd/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 94dae10db3d1..4a136f6de3f5 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 @@ -22,12 +22,15 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; 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" ]; postFixup = ''moveToOutput "bin/gdlib-config" $dev''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://libgd.github.io/; description = "A dynamic image creation library"; |