diff options
| author | Peter Simons <simons@cryp.to> | 2012-01-14 12:05:18 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-01-14 12:05:18 +0000 |
| commit | 9ddd08512998cd96ddd6bc906da242171896ef8c (patch) | |
| tree | ccdff0520ec13135627cdde6934e6ba9db73f6fc /pkgs/applications/version-management/subversion | |
| parent | a11fda4b4b054c9468be6702349d730647852ee5 (diff) | |
| download | nixlib-9ddd08512998cd96ddd6bc906da242171896ef8c.tar nixlib-9ddd08512998cd96ddd6bc906da242171896ef8c.tar.gz nixlib-9ddd08512998cd96ddd6bc906da242171896ef8c.tar.bz2 nixlib-9ddd08512998cd96ddd6bc906da242171896ef8c.tar.lz nixlib-9ddd08512998cd96ddd6bc906da242171896ef8c.tar.xz nixlib-9ddd08512998cd96ddd6bc906da242171896ef8c.tar.zst nixlib-9ddd08512998cd96ddd6bc906da242171896ef8c.zip | |
subversion: instantiate SASL only when it's actually enabled
svn path=/nixpkgs/trunk/; revision=31532
Diffstat (limited to 'pkgs/applications/version-management/subversion')
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index ad93550161ff..9e31e9906c62 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -42,10 +42,9 @@ 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"} + ${if saslSupport then "--enable-sasl --with-sasl=${sasl}" else "--disable-sasl"} --with-zlib=${zlib} --with-sqlite=${sqlite} - --with-sasl=${sasl} ''; preBuild = '' |