cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #263496 from poscat0x04/nginx-lua-resty

Browse source 
nginxModules.{lua,lua-upstream}: switch to luajit_openresty
This commit is contained in:
Ryan Lahfa 2023-12-31 21:32:58 +01:00 committed by GitHub
commit d07fb6a75c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/servers/http/nginx/modules.nix
View file

@ -22,7 +22,7 @@
, libuuid
, libxml2
, lmdb
, luajit
, luajit_openresty
, msgpuck
, openssl
, opentracing-cpp
@ -379,7 +379,7 @@ let self = {
sha256 = "sha256-TyeTL7/0dI2wS2eACS4sI+9tu7UpDq09aemMaklkUss=";
};
inputs = [ luajit ];
inputs = [ luajit_openresty ];
preConfigure = let
# fix compilation against nginx 1.23.0
@ -388,8 +388,8 @@ let self = {
sha256 = "sha256-l7GHFNZXg+RG2SIBjYJO1JHdGUtthWnzLIqEORJUNr4=";
};
in ''
export LUAJIT_LIB="${luajit}/lib"
export LUAJIT_INC="$(realpath ${luajit}/include/luajit-*)"
export LUAJIT_LIB="${luajit_openresty}/lib"
export LUAJIT_INC="$(realpath ${luajit_openresty}/include/luajit-*)"
# make source directory writable to allow generating src/ngx_http_lua_autoconf.h
lua_src=$TMPDIR/lua-src
@ -420,7 +420,7 @@ let self = {
sha256 = "1gqccg8airli3i9103zv1zfwbjm27h235qjabfbfqk503rjamkpk";
};
inputs = [ luajit ];
inputs = [ luajit_openresty ];
allowMemoryWriteExecute = true;
meta = with lib; {