From 8dacfd90bc55e761caa97e04b3037d714b085f37 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Sep 2006 20:15:40 +0000 Subject: [PATCH] * A non-hack. svn path=/nixpkgs/trunk/; revision=6495 --- .../version-management/subversion-1.4.x/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/subversion-1.4.x/default.nix b/pkgs/applications/version-management/subversion-1.4.x/default.nix index 0e29aa53a1a..e9a95f31cff 100644 --- a/pkgs/applications/version-management/subversion-1.4.x/default.nix +++ b/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; }