Merge pull request #29848 from volth/patch-64

libmicrohttpd: fix darwin build
This commit is contained in:
Daiderd Jordan 2017-09-28 21:10:48 +02:00 committed by GitHub
commit 6cdcdb14c9

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig }:
{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "libmicrohttpd-0.9.55";
@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
};
outputs = [ "out" "dev" "devdoc" "info" ];
buildInputs = [ libgcrypt curl gnutls pkgconfig ];
buildInputs = [ libgcrypt curl gnutls pkgconfig ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv libintlOrEmpty ];
preCheck = ''
# Since `localhost' can't be resolved in a chroot, work around it.
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/libmicrohttpd/;
maintainers = with maintainers; [ eelco vrthra fpletz ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}