pyrox.dev
Merge pull request #304704 from deshaw/upstream-fix-nginxModules.lua
+1
-8
pkgs/servers/http/nginx/modules.nix
+1
-8
pkgs/servers/http/nginx/modules.nix
···
385
386
inputs = [ luajit_openresty ];
387
388
-
preConfigure = let
389
-
# fix compilation against nginx 1.23.0
390
-
nginx-1-23-patch = fetchpatch {
391
-
url = "https://github.com/openresty/lua-nginx-module/commit/b6d167cf1a93c0c885c28db5a439f2404874cb26.patch";
392
-
sha256 = "sha256-l7GHFNZXg+RG2SIBjYJO1JHdGUtthWnzLIqEORJUNr4=";
393
-
};
394
-
in ''
395
export LUAJIT_LIB="${luajit_openresty}/lib"
396
export LUAJIT_INC="$(realpath ${luajit_openresty}/include/luajit-*)"
397
···
399
lua_src=$TMPDIR/lua-src
400
cp -r "${src}/" "$lua_src"
401
chmod -R +w "$lua_src"
402
-
patch -p1 -d $lua_src -i ${nginx-1-23-patch}
403
export configureFlags="''${configureFlags//"${src}"/"$lua_src"}"
404
unset lua_src
405
'';
···
385
386
inputs = [ luajit_openresty ];
387
388
+
preConfigure = ''
389
export LUAJIT_LIB="${luajit_openresty}/lib"
390
export LUAJIT_INC="$(realpath ${luajit_openresty}/include/luajit-*)"
391
···
393
lua_src=$TMPDIR/lua-src
394
cp -r "${src}/" "$lua_src"
395
chmod -R +w "$lua_src"
396
export configureFlags="''${configureFlags//"${src}"/"$lua_src"}"
397
unset lua_src
398
'';