mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
subversion: don't specify both --disable-keychain and --enable-keychain
svn path=/nixpkgs/trunk/; revision=25008
This commit is contained in:
parent
528a471aa8
commit
d1d201f11e
1 changed files with 1 additions and 2 deletions
|
@ -34,12 +34,11 @@ stdenv.mkDerivation rec {
|
|||
++ 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}
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue