From dbdc9eee05d516cbd49ea6c395b0ea61282be6aa Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 15 Jun 2015 13:16:27 +0200 Subject: [PATCH] cygwin: apr-util now also building on cygwin --- pkgs/development/libraries/apr-util/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index bceb10e3355..c35520f22fd 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 ]