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

Merge pull request #304704 from deshaw/upstream-fix-nginxModules.lua

Browse source
This commit is contained in:
Sandro 2024-04-17 11:37:59 +02:00 committed by GitHub
commit e79a4cbd5c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -385,13 +385,7 @@ let self = {
inputs = [ luajit_openresty ];
preConfigure = let
# fix compilation against nginx 1.23.0
nginx-1-23-patch = fetchpatch {
url = "https://github.com/openresty/lua-nginx-module/commit/b6d167cf1a93c0c885c28db5a439f2404874cb26.patch";
sha256 = "sha256-l7GHFNZXg+RG2SIBjYJO1JHdGUtthWnzLIqEORJUNr4=";
};
in ''
preConfigure = ''
export LUAJIT_LIB="${luajit_openresty}/lib"
export LUAJIT_INC="$(realpath ${luajit_openresty}/include/luajit-*)"
@ -399,7 +393,6 @@ let self = {
lua_src=$TMPDIR/lua-src
cp -r "${src}/" "$lua_src"
chmod -R +w "$lua_src"
patch -p1 -d $lua_src -i ${nginx-1-23-patch}
export configureFlags="''${configureFlags//"${src}"/"$lua_src"}"
unset lua_src
'';