Author: simons
Date: Mon Dec 6 18:01:22 2010
New Revision: 25008
URL: https://svn.nixos.org/websvn/nix/?rev=25008&sc=1
Log:
subversion: don't specify both --disable-keychain and --enable-keychain
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
Mon Dec 6 17:48:52 2010 (r25007)
+++ nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
Mon Dec 6 18:01:22 2010 (r25008)
@@ -34,12 +34,11 @@
++ stdenv.lib.optional perlBindings perl;
configureFlags = ''
- --disable-keychain
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
${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 ""}
+ ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"}
--with-zlib=${zlib}
--with-sqlite=${sqlite}
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
