libpng12/cross: Don't add zlib for Darwin builds.
Cross builds for Darwin already include the CoreFoundation and the libraries from XCode, so zlib already exists on that platform. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
f73851710e
commit
cdaced58ae
|
@ -1,6 +1,6 @@
|
||||||
{ stdenv, fetchurl, zlib, xz }:
|
{ stdenv, fetchurl, zlib, xz }:
|
||||||
|
|
||||||
assert zlib != null;
|
assert !(stdenv ? cross) -> zlib != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libpng-1.2.50";
|
name = "libpng-1.2.50";
|
||||||
|
@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
passthru = { inherit zlib; };
|
passthru = { inherit zlib; };
|
||||||
|
|
||||||
|
crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
|
||||||
|
propagatedBuildInputs = [];
|
||||||
|
passthru = {};
|
||||||
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "The official reference implementation for the PNG file format";
|
description = "The official reference implementation for the PNG file format";
|
||||||
homepage = http://www.libpng.org/pub/png/libpng.html;
|
homepage = http://www.libpng.org/pub/png/libpng.html;
|
||||||
|
|
Loading…
Reference in a new issue