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

gd: cherry-pick a temporary patch for darwin

Browse Source
This commit is contained in:
Anthony Cowley 2016-07-18 15:00:23 -04:00
parent 457460a86d
commit 9b658d51cb
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@
, libXpm ? null
, fontconfig
, freetype
, fetchpatch, autoreconfHook, perl
}:
stdenv.mkDerivation rec {
@ -19,7 +20,17 @@ stdenv.mkDerivation rec {
sha256 = "1311g5mva2xlzqv3rjqjc4jjkn5lzls4skvr395h633zw1n7b7s8";
};
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 ];