public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

subversion: don't specify both --disable-keychain and --enable-keychain 

svn path=/nixpkgs/trunk/; revision=25008
This commit is contained in:
Peter Simons 2010-12-06 18:01:22 +00:00
parent 528a471aa8
commit d1d201f11e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/version-management/subversion/default.nix
View File

@ -34,12 +34,11 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional perlBindings perl; ++ stdenv.lib.optional perlBindings perl;
configureFlags = '' configureFlags = ''
--disable-keychain
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"} ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} ${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-zlib=${zlib}
--with-sqlite=${sqlite} --with-sqlite=${sqlite}
''; '';