diff options
| author | janus <janus@xn--kn-1ia.guru> | 2015-11-28 00:46:00 +0000 |
|---|---|---|
| committer | janus <janus@xn--kn-1ia.guru> | 2016-01-01 17:01:13 +0000 |
| commit | a472d836f674fe388018aaee75983e3400a77db4 (patch) | |
| tree | 5ee0c10f33ad74f04d5d3785de81fbb04b4e57f2 /pkgs/development/libraries/apr-util | |
| parent | 9897b356612c4bb06a9c9d688da52134dfe8fb95 (diff) | |
FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep
Diffstat (limited to 'pkgs/development/libraries/apr-util')
| -rw-r--r-- | pkgs/development/libraries/apr-util/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/apr-util/include-static-dependencies.patch | 12 |
2 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index c35520f22fd3..e0b2832f6e42 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -3,6 +3,7 @@ , bdbSupport ? false, db , ldapSupport ? !stdenv.isCygwin, openldap , libiconv +, cyrus_sasl, autoreconfHook }: assert sslSupport -> openssl != null; @@ -19,19 +20,24 @@ stdenv.mkDerivation rec { sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6"; }; + patches = stdenv.lib.optionals stdenv.isFreeBSD [ ./include-static-dependencies.patch ]; + + buildInputs = stdenv.lib.optionals stdenv.isFreeBSD [ autoreconfHook ]; + configureFlags = '' --with-apr=${apr} --with-expat=${expat} ${optionalString (!stdenv.isCygwin) "--with-crypto"} ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"} ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"} - ${stdenv.lib.optionalString ldapSupport "--with-ldap"}${ + ${stdenv.lib.optionalString ldapSupport "--with-ldap=ldap"}${ optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"} ''; propagatedBuildInputs = [ makeWrapper apr expat libiconv ] ++ optional sslSupport openssl ++ optional bdbSupport db - ++ optional ldapSupport openldap; + ++ optional ldapSupport openldap + ++ optional stdenv.isFreeBSD cyrus_sasl; # Give apr1 access to sed for runtime invocations postInstall = '' diff --git a/pkgs/development/libraries/apr-util/include-static-dependencies.patch b/pkgs/development/libraries/apr-util/include-static-dependencies.patch new file mode 100644 index 000000000000..1813c7217810 --- /dev/null +++ b/pkgs/development/libraries/apr-util/include-static-dependencies.patch @@ -0,0 +1,12 @@ +diff --git a/build/apu-conf.m4 b/build/apu-conf.m4 +index 8943f10..aa44305 100644 +--- a/build/apu-conf.m4 ++++ b/build/apu-conf.m4 +@@ -279,6 +279,7 @@ AC_ARG_WITH(ldap,[ --with-ldap=library ldap library to use], + APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lsocket -lnsl") + APU_FIND_LDAPLIB("ldap", "-ldl -lpthread") + else ++ APU_FIND_LDAPLIB($LIBLDAP, "-llber -lcrypto -lssl -lsasl2") + APU_FIND_LDAPLIB($LIBLDAP) + APU_FIND_LDAPLIB($LIBLDAP, "-lresolv") + APU_FIND_LDAPLIB($LIBLDAP, "-lresolv -lsocket -lnsl") |