diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-09-28 21:10:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 21:10:48 +0200 |
| commit | 6cdcdb14c92c42f969533fd2928a48c9ad95109f (patch) | |
| tree | 98ca7ac5cbb835569a3c5f596b4398ca8e84ba73 | |
| parent | d84d8af862c492e7e9bf0c76d407e5c9fd58cc95 (diff) | |
| parent | 547dba10c01207dc1d9ebfcf53867d5d8ee26a8c (diff) | |
| download | nixlib-6cdcdb14c92c42f969533fd2928a48c9ad95109f.tar nixlib-6cdcdb14c92c42f969533fd2928a48c9ad95109f.tar.gz nixlib-6cdcdb14c92c42f969533fd2928a48c9ad95109f.tar.bz2 nixlib-6cdcdb14c92c42f969533fd2928a48c9ad95109f.tar.lz nixlib-6cdcdb14c92c42f969533fd2928a48c9ad95109f.tar.xz nixlib-6cdcdb14c92c42f969533fd2928a48c9ad95109f.tar.zst nixlib-6cdcdb14c92c42f969533fd2928a48c9ad95109f.zip | |
Merge pull request #29848 from volth/patch-64
libmicrohttpd: fix darwin build
| -rw-r--r-- | pkgs/development/libraries/libmicrohttpd/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 23e6a37f918c..ec03032105fb 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -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; }; } + |