diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2013-10-10 02:38:47 +0200 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-10-20 22:51:27 +0300 |
| commit | 5de7170aa55c999a7743c30b9288951f4ebe5332 (patch) | |
| tree | b1e89d0370f47da4ad859d55426b51ae841344dc | |
| parent | aeff0028bfbef56796a6d8eb126a664ca8350893 (diff) | |
| download | nixlib-5de7170aa55c999a7743c30b9288951f4ebe5332.tar nixlib-5de7170aa55c999a7743c30b9288951f4ebe5332.tar.gz nixlib-5de7170aa55c999a7743c30b9288951f4ebe5332.tar.bz2 nixlib-5de7170aa55c999a7743c30b9288951f4ebe5332.tar.lz nixlib-5de7170aa55c999a7743c30b9288951f4ebe5332.tar.xz nixlib-5de7170aa55c999a7743c30b9288951f4ebe5332.tar.zst nixlib-5de7170aa55c999a7743c30b9288951f4ebe5332.zip | |
nginx: Add optional patch for syslog support.
close #1055.
| -rw-r--r-- | pkgs/servers/http/nginx/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 8e77d07e5c59..28390aa38da0 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat, fullWebDAV ? false }: +{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat, fullWebDAV ? false, syslog ? false }: let dav-ext = fetchgit { @@ -6,6 +6,12 @@ let rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d"; sha256 = "1dvpq1fg5rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; }; + + syslog-ext = fetchgit { + url = https://github.com/yaoweibin/nginx_syslog_patch.git; + rev = "165affd9741f0e30c4c8225da5e487d33832aca3"; + sha256 = "14dkkafjnbapp6jnvrjg9ip46j00cr8pqc2g7374z9aj7hrvdvhs"; + }; in stdenv.mkDerivation rec { @@ -18,6 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat; + patches = if syslog then [ "${syslog-ext}/syslog_1.4.0.patch" ] else []; + configureFlags = [ "--with-http_ssl_module" "--with-http_xslt_module" @@ -27,7 +35,8 @@ stdenv.mkDerivation rec { "--with-http_secure_link_module" # Install destination problems # "--with-http_perl_module" - ] ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}"; + ] ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}" + ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}"; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2" |