about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2010-12-06 18:01:22 +0000
committerPeter Simons <simons@cryp.to>2010-12-06 18:01:22 +0000
commitd1d201f11eb3ef0a6917faca2e80e3c39d8f227a (patch)
tree2156eb2558c893a6c3681127295cce3f5571d218
parent528a471aa890b009dc26d253861e5b20978b582d (diff)
downloadnixlib-d1d201f11eb3ef0a6917faca2e80e3c39d8f227a.tar
nixlib-d1d201f11eb3ef0a6917faca2e80e3c39d8f227a.tar.gz
nixlib-d1d201f11eb3ef0a6917faca2e80e3c39d8f227a.tar.bz2
nixlib-d1d201f11eb3ef0a6917faca2e80e3c39d8f227a.tar.lz
nixlib-d1d201f11eb3ef0a6917faca2e80e3c39d8f227a.tar.xz
nixlib-d1d201f11eb3ef0a6917faca2e80e3c39d8f227a.tar.zst
nixlib-d1d201f11eb3ef0a6917faca2e80e3c39d8f227a.zip
subversion: don't specify both --disable-keychain and --enable-keychain
svn path=/nixpkgs/trunk/; revision=25008
-rw-r--r--pkgs/applications/version-management/subversion/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index f66b0ed78b33..95d21e2f7a6c 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -34,12 +34,11 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional perlBindings perl;
 
   configureFlags = ''
-    --disable-keychain
     ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
     ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
     ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
     ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
-    ${if stdenv.isDarwin then "--enable-keychain" else ""}
+    ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"}
     --with-zlib=${zlib}
     --with-sqlite=${sqlite}
   '';