From d1d201f11eb3ef0a6917faca2e80e3c39d8f227a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Dec 2010 18:01:22 +0000 Subject: [PATCH] subversion: don't specify both --disable-keychain and --enable-keychain svn path=/nixpkgs/trunk/; revision=25008 --- pkgs/applications/version-management/subversion/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index f66b0ed78b3..95d21e2f7a6 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} '';