about summary refs log tree commit diff
path: root/pkgs/servers/http
diff options
context:
space:
mode:
authorJude Taylor <me@jude.bio>2015-10-23 10:57:43 -0700
committerJude Taylor <me@jude.bio>2015-10-23 10:57:43 -0700
commitf35f421d60620e70fdb1fa76a4d1a1fcd849a32f (patch)
tree977c0f25246cf249efb4e3b24548700da8763b09 /pkgs/servers/http
parent3ff552fabe09ee35fdd5a1f70caa492997f211ec (diff)
downloadnixlib-f35f421d60620e70fdb1fa76a4d1a1fcd849a32f.tar
nixlib-f35f421d60620e70fdb1fa76a4d1a1fcd849a32f.tar.gz
nixlib-f35f421d60620e70fdb1fa76a4d1a1fcd849a32f.tar.bz2
nixlib-f35f421d60620e70fdb1fa76a4d1a1fcd849a32f.tar.lz
nixlib-f35f421d60620e70fdb1fa76a4d1a1fcd849a32f.tar.xz
nixlib-f35f421d60620e70fdb1fa76a4d1a1fcd849a32f.tar.zst
nixlib-f35f421d60620e70fdb1fa76a4d1a1fcd849a32f.zip
apache-httpd: add libiconv for darwin
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r--pkgs/servers/http/apache-httpd/2.4.nix5
1 files 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";