summaryrefslogtreecommitdiffstats
path: root/pkgs/development/libraries/apr-util
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-01-19 09:55:31 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-01-19 09:55:31 +0100
commit716aac2519a7571e7f5fd984a886d579a4a051c5 (patch)
tree53cf89cf764d787f4dc8f08474479892b9733177 /pkgs/development/libraries/apr-util
parentf8472457a440de3c44f6f604142d678b6ae2a762 (diff)
parent53b389327e34de319dc0dbda2b6bcab1a69db69d (diff)
Merge branch 'staging' into closure-size
Diffstat (limited to 'pkgs/development/libraries/apr-util')
-rw-r--r--pkgs/development/libraries/apr-util/default.nix25
-rw-r--r--pkgs/development/libraries/apr-util/include-static-dependencies.patch12
2 files changed, 27 insertions, 10 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index f1c0807144be..6f0956f1d1d1 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,24 +20,28 @@ stdenv.mkDerivation rec {
sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
};
+ patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch;
+
outputs = [ "dev" "out" ];
outputBin = "dev";
- configureFlags = ''
- --with-apr=${apr} --with-expat=${expat}
- ${optionalString (!stdenv.isCygwin) "--with-crypto"}
- ${stdenv.lib.optionalString sslSupport "--with-openssl"}
- ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
- ${stdenv.lib.optionalString ldapSupport "--with-ldap"}${
- optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
- '';
+ buildInputs = optional stdenv.isFreeBSD autoreconfHook;
- buildInputs = stdenv.lib.optional sslSupport openssl;
+ configureFlags = [ "--with-apr=${apr}" "--with-expat=${expat}" ]
+ ++ optional (!stdenv.isCygwin) "--with-crypto"
+ ++ optional sslSupport "--with-openssl=${openssl}"
+ ++ optional bdbSupport "--with-berkeley-db=${db}"
+ ++ optional ldapSupport "--with-ldap=ldap"
+ ++ optionals 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")