summaryrefslogtreecommitdiffstats
path: root/pkgs/development/libraries/apr-util
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-01-05 09:42:56 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-01-05 09:42:56 +0100
commitaa4562596f4cc5a53eae70fdf75a8995cc001c86 (patch)
tree3222b9985e90886a7e64f78fd8861600ce9a8777 /pkgs/development/libraries/apr-util
parent9b091e8a0c6dcb5892e2a9e704e952d8ea333525 (diff)
apr-util: refactor options
Diffstat (limited to 'pkgs/development/libraries/apr-util')
-rw-r--r--pkgs/development/libraries/apr-util/default.nix25
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index e0b2832f6e42..c123740f5c12 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -20,18 +20,19 @@ 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=ldap"}${
- optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
- '';
+ patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch;
+
+ buildInputs = optional stdenv.isFreeBSD autoreconfHook;
+
+ 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