diff options
| author | Peter Simons <simons@cryp.to> | 2012-01-14 11:41:06 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-01-14 11:41:06 +0000 |
| commit | ef343ed3aba1ef74d5070c03534da39f57ff347a (patch) | |
| tree | 3f525e33ac686158b65fcfc6a90b52261392ad01 /pkgs/applications | |
| parent | 32327df9187e580711ec5f78871fd57c44637a8f (diff) | |
| download | nixlib-ef343ed3aba1ef74d5070c03534da39f57ff347a.tar nixlib-ef343ed3aba1ef74d5070c03534da39f57ff347a.tar.gz nixlib-ef343ed3aba1ef74d5070c03534da39f57ff347a.tar.bz2 nixlib-ef343ed3aba1ef74d5070c03534da39f57ff347a.tar.lz nixlib-ef343ed3aba1ef74d5070c03534da39f57ff347a.tar.xz nixlib-ef343ed3aba1ef74d5070c03534da39f57ff347a.tar.zst nixlib-ef343ed3aba1ef74d5070c03534da39f57ff347a.zip | |
subversion: add sasl support
svn path=/nixpkgs/trunk/; revision=31530
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
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 = '' |