diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-21 00:56:43 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-21 00:56:43 +0000 |
| commit | 1f04b4a566d3c8f8de5354ed09dee46557c4abe3 (patch) | |
| tree | b8239cfc8cced160642aa698e18048844164ccc6 /pkgs/development/libraries/gd | |
| parent | cc540843fe88a5e490e07e861f8dbb8f4714ece7 (diff) | |
| parent | db7b4fb073d25832ecc4e216d410ad2dde153c43 (diff) | |
| download | nixpkgs-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar nixpkgs-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.gz nixpkgs-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.bz2 nixpkgs-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.lz nixpkgs-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.xz nixpkgs-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.zst nixpkgs-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/libraries/gd')
| -rw-r--r-- | pkgs/development/libraries/gd/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 8e5005d6b90..4982b7d462d 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -8,6 +8,7 @@ , libXpm ? null , fontconfig , freetype +, fetchpatch, autoreconfHook, perl }: stdenv.mkDerivation rec { @@ -21,7 +22,18 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + # Address an incompatibility with Darwin's libtool + patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch { + url = https://github.com/libgd/libgd/commit/502e4cd873c3b37b307b9f450ef827d40916c3d6.patch; + sha256 = "0gawr2c4zr6cljnwzhdlxhz2mkbg0r5vzvr79dv6yf6fcj06awfs"; + }); + + # -pthread gets passed to clang, causing warnings + configureFlags = stdenv.lib.optional stdenv.isDarwin "--enable-werror=no"; + + nativeBuildInputs = [ pkgconfig ] + ++ stdenv.lib.optionals stdenv.isDarwin [ autoreconfHook perl ]; + buildInputs = [ zlib fontconfig freetype ]; propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ]; |