public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apache-httpd: add libiconv for darwin

Browse Source
This commit is contained in:
Jude Taylor 2015-10-23 10:57:43 -07:00
parent 3ff552fabe
commit f35f421d60
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre { stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv
, proxySupport ? true , proxySupport ? true
, sslSupport ? true, openssl , sslSupport ? true, openssl
, ldapSupport ? true, openldap , ldapSupport ? true, openldap
@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
buildInputs = [perl] ++ buildInputs = [perl] ++
optional ldapSupport openldap ++ # there is no --with-ldap flag optional ldapSupport openldap ++ # there is no --with-ldap flag
optional libxml2Support libxml2; optional libxml2Support libxml2 ++
optional stdenv.isDarwin libiconv;
# Required for ‘pthread_cancel’. # Required for ‘pthread_cancel’.
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";