* A non-hack.

svn path=/nixpkgs/trunk/; revision=6495

pkgs/applications/version-management/subversion-1.4.x/default.nix

@@ -31,6 +31,7 @@ stdenv.mkDerivation {
   configureFlags = "
     --without-gdbm --disable-static
     --with-apr=${apr} -with-apr-util=${aprutil} --with-neon=${neon}
+    --disable-keychain
     ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
     ${if httpServer then
         "--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 ""}
   ";
 
-  # 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;
 }