From 9ddd08512998cd96ddd6bc906da242171896ef8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jan 2012 12:05:18 +0000 Subject: [PATCH] subversion: instantiate SASL only when it's actually enabled svn path=/nixpkgs/trunk/; revision=31532 --- pkgs/applications/version-management/subversion/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index ad93550161f..9e31e9906c6 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 = ''