Author: simons
Date: Sat Jan 14 11:41:06 2012
New Revision: 31530
URL: https://nixos.org/websvn/nix/?rev=31530&sc=1
Log:
subversion: add sasl support
Modified:
nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
Sat Jan 14 09:40:08 2012 (r31529)
+++ nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
Sat Jan 14 11:41:06 2012 (r31530)
@@ -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 @@
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 @@
${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 = ''
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 14 09:40:08
2012 (r31529)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 14 11:41:06
2012 (r31530)
@@ -7418,8 +7418,10 @@
pythonBindings = false;
perlBindings = false;
javahlBindings = false;
+ saslSupport = false;
compressionSupport = true;
httpd = apacheHttpd;
+ sasl = cyrus_sasl;
};
subversionClient = lowPrio (appendToName "client" (subversion.override {
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
