nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-03 10:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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