From ef343ed3aba1ef74d5070c03534da39f57ff347a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Jan 2012 11:41:06 +0000
Subject: [PATCH] subversion: add sasl support

svn path=/nixpkgs/trunk/; revision=31530
---
 .../applications/version-management/subversion/default.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix                            | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index a1a6a3fcd7fb..ad93550161ff 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -6,8 +6,10 @@
 , pythonBindings ? false
 , perlBindings ? false
 , javahlBindings ? false
+, saslSupport ? false
 , stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite
 , httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
+, sasl ? null
 }:
 
 assert bdbSupport -> aprutil.bdbSupport;
@@ -31,7 +33,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib apr aprutil sqlite ]
     ++ stdenv.lib.optional httpSupport neon
     ++ stdenv.lib.optional pythonBindings python
-    ++ stdenv.lib.optional perlBindings perl;
+    ++ stdenv.lib.optional perlBindings perl
+    ++ stdenv.lib.optional saslSupport sasl;
 
   configureFlags = ''
     ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
@@ -39,8 +42,10 @@ stdenv.mkDerivation rec {
     ${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 "--disable-keychain"}
+    ${if saslSupport then "--enable-sasl" else "--disable-sasl"}
     --with-zlib=${zlib}
     --with-sqlite=${sqlite}
+    --with-sasl=${sasl}
   '';
 
   preBuild = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d6884a4b9dd..d6aaaa7edf8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7418,8 +7418,10 @@ let
     pythonBindings = false;
     perlBindings = false;
     javahlBindings = false;
+    saslSupport = false;
     compressionSupport = true;
     httpd = apacheHttpd;
+    sasl = cyrus_sasl;
   };
 
   subversionClient = lowPrio (appendToName "client" (subversion.override {