From f35f421d60620e70fdb1fa76a4d1a1fcd849a32f Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Fri, 23 Oct 2015 10:57:43 -0700 Subject: [PATCH] apache-httpd: add libiconv for darwin --- pkgs/servers/http/apache-httpd/2.4.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 0b1ed992439c..aa8dfdd45f51 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre +{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv , proxySupport ? true , sslSupport ? true, openssl , ldapSupport ? true, openldap @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [perl] ++ optional ldapSupport openldap ++ # there is no --with-ldap flag - optional libxml2Support libxml2; + optional libxml2Support libxml2 ++ + optional stdenv.isDarwin libiconv; # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";