pyrox.dev
lol
cygwin: apr-util now also building on cygwin
+4
-5
pkgs/development/libraries/apr-util/default.nix
+4
-5
pkgs/development/libraries/apr-util/default.nix
···
9
9
assert bdbSupport -> db != null;
10
10
assert ldapSupport -> openldap != null;
11
11
12
-
let
13
-
optional = stdenv.lib.optional;
14
-
in
12
+
with stdenv.lib;
15
13
16
14
stdenv.mkDerivation rec {
17
15
name = "apr-util-1.5.4";
···
23
21
24
22
configureFlags = ''
25
23
--with-apr=${apr} --with-expat=${expat}
26
-
${if !stdenv.isCygwin then "--with-crypto" else "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
24
+
${optionalString (!stdenv.isCygwin) "--with-crypto"}
27
25
${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
28
26
${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
29
-
${stdenv.lib.optionalString ldapSupport "--with-ldap"}
27
+
${stdenv.lib.optionalString ldapSupport "--with-ldap"}${
28
+
optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
30
29
'';
31
30
32
31
propagatedBuildInputs = [ makeWrapper apr expat libiconv ]