Author: simons
Date: Sat Jan 14 12:05:18 2012
New Revision: 31532
URL: https://nixos.org/websvn/nix/?rev=31532&sc=1
Log:
subversion: instantiate SASL only when it's actually enabled
Modified:
nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
Sat Jan 14 11:58:29 2012 (r31531)
+++ nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
Sat Jan 14 12:05:18 2012 (r31532)
@@ -42,10 +42,9 @@
${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 = ''
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
