diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-07 11:55:49 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-07 12:08:30 +0100 |
commit | dde6d5708cde2c48b0b8f9d9dec2edd0f9e1a974 (patch) | |
tree | 3b30f4631f5c2f3b08e64e40950af7cb861983d7 /pkgs/applications/version-management | |
parent | 69bb66902f3f5a6f4728954fceb1b298ca1c95ce (diff) |
Add set apacheHttpdPackages containing modules for specific Apache versions
Similar to linuxPackages etc.
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 283ea7591538a..c2a14665a8989 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -6,12 +6,12 @@ , javahlBindings ? false , saslSupport ? false , stdenv, fetchurl, apr, aprutil, zlib, sqlite -, httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null +, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null }: assert bdbSupport -> aprutil.bdbSupport; -assert httpServer -> httpd != null; +assert httpServer -> apacheHttpd != null; assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { configureFlags = '' ${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=${apacheHttpd}/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 "--disable-keychain"} |