* A non-hack.

svn path=/nixpkgs/trunk/; revision=6495
This commit is contained in:
Eelco Dolstra 2006-09-11 20:15:40 +00:00
parent 0223e02f17
commit 8dacfd90bc

View File

@ -31,6 +31,7 @@ stdenv.mkDerivation {
configureFlags = " configureFlags = "
--without-gdbm --disable-static --without-gdbm --disable-static
--with-apr=${apr} -with-apr-util=${aprutil} --with-neon=${neon} --with-apr=${apr} -with-apr-util=${aprutil} --with-neon=${neon}
--disable-keychain
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
${if httpServer then ${if httpServer then
"--with-apxs=${httpd}/bin/apxs --with-apr=${httpd} --with-apr-util=${httpd}" "--with-apxs=${httpd}/bin/apxs --with-apr=${httpd} --with-apr-util=${httpd}"
@ -40,9 +41,5 @@ stdenv.mkDerivation {
${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
"; ";
# Quick hack to get it to build on Darwin (which may not have all of
# the required header files for this option).
NIX_CFLAGS_COMPILE = "-U SVN_HAVE_KEYCHAIN_SERVICES";
inherit httpServer pythonBindings javahlBindings; inherit httpServer pythonBindings javahlBindings;
} }