diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-09-11 20:15:40 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-09-11 20:15:40 +0000 |
commit | 8dacfd90bc55e761caa97e04b3037d714b085f37 (patch) | |
tree | 517c7dd31fb8cb0acdeaab4c0b0593988907f283 /pkgs/applications/version-management | |
parent | 0223e02f1768e8a6cd4732ae3377dc4abe1b660c (diff) | |
download | nixpkgs-8dacfd90bc55e761caa97e04b3037d714b085f37.tar nixpkgs-8dacfd90bc55e761caa97e04b3037d714b085f37.tar.gz nixpkgs-8dacfd90bc55e761caa97e04b3037d714b085f37.tar.bz2 nixpkgs-8dacfd90bc55e761caa97e04b3037d714b085f37.tar.lz nixpkgs-8dacfd90bc55e761caa97e04b3037d714b085f37.tar.xz nixpkgs-8dacfd90bc55e761caa97e04b3037d714b085f37.tar.zst nixpkgs-8dacfd90bc55e761caa97e04b3037d714b085f37.zip |
* A non-hack.
svn path=/nixpkgs/trunk/; revision=6495
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/subversion-1.4.x/default.nix | 5 |
1 files changed, 1 insertions, 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; } |