public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

subversion: add sasl support

Browse Source 
svn path=/nixpkgs/trunk/; revision=31530
This commit is contained in:
Peter Simons 2012-01-14 11:41:06 +00:00
parent 32327df918
commit ef343ed3ab
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/version-management/subversion/default.nix
View File

@ -6,8 +6,10 @@
, pythonBindings ? false , pythonBindings ? false
, perlBindings ? false , perlBindings ? false
, javahlBindings ? false , javahlBindings ? false
, saslSupport ? false
, stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite , stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite
, httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
, sasl ? null
}: }:
assert bdbSupport -> aprutil.bdbSupport; assert bdbSupport -> aprutil.bdbSupport;
@ -31,7 +33,8 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib apr aprutil sqlite ] buildInputs = [ zlib apr aprutil sqlite ]
++ stdenv.lib.optional httpSupport neon ++ stdenv.lib.optional httpSupport neon
++ stdenv.lib.optional pythonBindings python ++ stdenv.lib.optional pythonBindings python
++ stdenv.lib.optional perlBindings perl; ++ stdenv.lib.optional perlBindings perl
++ stdenv.lib.optional saslSupport sasl;
configureFlags = '' configureFlags = ''
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} ${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 pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"} ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"}
${if saslSupport then "--enable-sasl" else "--disable-sasl"}
--with-zlib=${zlib} --with-zlib=${zlib}
--with-sqlite=${sqlite} --with-sqlite=${sqlite}
--with-sasl=${sasl}
''; '';
preBuild = '' preBuild = ''

2
pkgs/top-level/all-packages.nix
View File

@ -7418,8 +7418,10 @@ let
pythonBindings = false; pythonBindings = false;
perlBindings = false; perlBindings = false;
javahlBindings = false; javahlBindings = false;
saslSupport = false;
compressionSupport = true; compressionSupport = true;
httpd = apacheHttpd; httpd = apacheHttpd;
sasl = cyrus_sasl;
}; };
subversionClient = lowPrio (appendToName "client" (subversion.override { subversionClient = lowPrio (appendToName "client" (subversion.override {