diff options
| author | Rok Garbas <rok@garbas.si> | 2015-06-15 13:16:27 +0200 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2015-06-24 15:49:59 +0200 |
| commit | dbdc9eee05d516cbd49ea6c395b0ea61282be6aa (patch) | |
| tree | 6cb097d3a580146e1c042bedbbcc690bdf3805a2 /pkgs/development/libraries/apr-util | |
| parent | 4b661693cb8531fa510af0ea035708fcba9e3b07 (diff) | |
cygwin: apr-util now also building on cygwin
Diffstat (limited to 'pkgs/development/libraries/apr-util')
| -rw-r--r-- | pkgs/development/libraries/apr-util/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index bceb10e335558..c35520f22fd38 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -9,9 +9,7 @@ assert sslSupport -> openssl != null; assert bdbSupport -> db != null; assert ldapSupport -> openldap != null; -let - optional = stdenv.lib.optional; -in +with stdenv.lib; stdenv.mkDerivation rec { name = "apr-util-1.5.4"; @@ -23,10 +21,11 @@ stdenv.mkDerivation rec { configureFlags = '' --with-apr=${apr} --with-expat=${expat} - ${if !stdenv.isCygwin then "--with-crypto" else "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"} + ${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"}${ + optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"} ''; propagatedBuildInputs = [ makeWrapper apr expat libiconv ] |