summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2014-09-03 21:37:18 +0400
committerMichael Raskin <7c6f434c@mail.ru>2014-09-03 21:37:18 +0400
commitd3c5e960b4bddf769928167d8bb1c1ff015e5979 (patch)
tree5ea2a7965e480261fc2d7cf2c7dd624d98731e3c /pkgs/servers
parent7a7a034f30b7bf6c6c8823fcc59f682235eed38c (diff)
parent2559ea7138744bdf6e15b52e4c84bf134bba4fbf (diff)
downloadnixpkgs-d3c5e960b4bddf769928167d8bb1c1ff015e5979.tar
nixpkgs-d3c5e960b4bddf769928167d8bb1c1ff015e5979.tar.gz
nixpkgs-d3c5e960b4bddf769928167d8bb1c1ff015e5979.tar.bz2
nixpkgs-d3c5e960b4bddf769928167d8bb1c1ff015e5979.tar.lz
nixpkgs-d3c5e960b4bddf769928167d8bb1c1ff015e5979.tar.xz
nixpkgs-d3c5e960b4bddf769928167d8bb1c1ff015e5979.tar.zst
nixpkgs-d3c5e960b4bddf769928167d8bb1c1ff015e5979.zip
Merge pull request #3878 from pmahoney/ngx_lua
nginx: add lua module
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/http/nginx/default.nix25
1 files changed, 22 insertions, 3 deletions
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 903cf038d6e..700317bc799 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat
-, gd, geoip
+, gd, geoip, luajit
 , rtmp ? false
 , fullWebDAV ? false
 , syslog ? false
 , moreheaders ? false
-, echo ? false }:
+, echo ? false
+, ngx_lua ? false }:
 
 with stdenv.lib;
 
@@ -44,6 +45,19 @@ let
     rev = "refs/tags/v0.53";
     sha256 = "90d4e3a49c678019f4f335bc18529aa108fcc9cfe0747ea4e2f6084a70da2868";
   };
+
+  develkit-ext = fetchgit {
+    url = https://github.com/simpl/ngx_devel_kit.git;
+    rev = "refs/tags/v0.2.19";
+    sha256 = "169m6gsa5b6zh1ws8qx2k7dbswld1zmhm4dh57qka0h07gs5dqjg";
+  };
+
+  lua-ext = fetchgit {
+    url = https://github.com/openresty/lua-nginx-module.git;
+    rev = "refs/tags/v0.9.11";
+    sha256 = "0y7238bvb907n7fsz5sivxbhfz2xnf4f0lzwk3k3h9j20fsyvwqq";
+  };
+
 in
 
 stdenv.mkDerivation rec {
@@ -52,7 +66,11 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ openssl zlib pcre libxml2 libxslt gd geoip
-    ] ++ optional fullWebDAV expat;
+    ] ++ optional fullWebDAV expat
+      ++ optional ngx_lua luajit;
+
+  LUAJIT_LIB = if ngx_lua then "${luajit}/lib" else "";
+  LUAJIT_INC = if ngx_lua then "${luajit}/include/luajit-2.0" else "";
 
   patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else [];
 
@@ -83,6 +101,7 @@ stdenv.mkDerivation rec {
     ++ optional syslog "--add-module=${syslog-ext}"
     ++ optional moreheaders "--add-module=${moreheaders-ext}"
     ++ optional echo "--add-module=${echo-ext}"
+    ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}"
     ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio";