JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cygwin: apr-util now also building on cygwin

Browse Source
This commit is contained in:
Rok Garbas 2015-06-15 13:16:27 +02:00
parent 4b661693cb
commit dbdc9eee05
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/apr-util/default.nix
View File

@ -9,9 +9,7 @@ assert sslSupport -> openssl != null;
assert bdbSupport -> db != null; assert bdbSupport -> db != null;
assert ldapSupport -> openldap != null; assert ldapSupport -> openldap != null;
let with stdenv.lib;
optional = stdenv.lib.optional;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "apr-util-1.5.4"; name = "apr-util-1.5.4";
@ -23,10 +21,11 @@ stdenv.mkDerivation rec {
configureFlags = '' configureFlags = ''
--with-apr=${apr} --with-expat=${expat} --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 sslSupport "--with-openssl=${openssl}"}
${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"} ${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 ] propagatedBuildInputs = [ makeWrapper apr expat libiconv ]