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

* Apache httpd: build against apr, aputil and pcre instead of using

Browse Source 
its own copies.

svn path=/nixpkgs/trunk/; revision=12971
This commit is contained in:
Eelco Dolstra
2008-10-06 13:38:45 +00:00
parent 487a8ddb9e
commit 781bb5a6e1
8 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/subversion-1.4.x/default.nix
+10 -14
View File
@@ -10,7 +10,7 @@
}:
assert bdbSupport -> aprutil.bdbSupport;
assert httpServer -> httpd != null && httpd.expat == expat;
assert httpServer -> httpd != null && httpd.apr == apr && httpd.aprutil == aprutil;
assert pythonBindings -> swig != null && swig.pythonSupport;
assert javahlBindings -> jdk != null;
assert sslSupport -> neon.sslSupport;
@@ -30,32 +30,28 @@ stdenv.mkDerivation rec {
buildInputs =
[expat zlib]
++ (if pythonBindings then [swig.python] else [])
++ (if perlBindings then [swig.perl] else [])
;
++ stdenv.lib.optional pythonBindings swig.python
++ stdenv.lib.optional perlBindings swig.perl
;
configureFlags = "
configureFlags = ''
--without-gdbm --disable-static
--with-apr=${apr} -with-apr-util=${aprutil} --with-neon=${neon}
--disable-keychain
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
${if httpServer then
"--with-apxs=${httpd}/bin/apxs --with-apr=${httpd} --with-apr-util=${httpd}"
else
"--without-apxs"}
${if (pythonBindings || perlBindings) then "--with-swig=${swig}" else "--without-swig"}
${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 ""}
--disable-neon-version-check
";
'';
inherit httpServer pythonBindings javahlBindings perlBindings;
patches = [ ./subversion-respect_CPPFLAGS_in_perl_bindings.patch ];
passthru = {
inherit perlBindings pythonBindings;
python = if ( swig != null ) && (swig ? python) then
swig.python
else null;
python = if swig != null && swig ? python then swig.python else null;
};
meta = {
pkgs/applications/version-management/subversion-1.5.x/default.nix
+2 -5
View File
@@ -11,7 +11,7 @@
}:
assert bdbSupport -> aprutil.bdbSupport;
assert httpServer -> httpd != null && httpd.expat == expat;
assert httpServer -> httpd != null && httpd.apr == apr && httpd.aprutil == aprutil;
assert pythonBindings -> swig != null && swig.pythonSupport;
assert javahlBindings -> jdk != null;
assert sslSupport -> neon.sslSupport;
@@ -37,10 +37,7 @@ stdenv.mkDerivation rec {
--disable-static
--disable-keychain
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
${if httpServer then
"--with-apxs=${httpd}/bin/apxs --with-apr=${httpd} --with-apr-util=${httpd}"
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 javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
--disable-neon-version-check