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

nginxModules.lua: remove patch that is already applied

Browse source 
This module was applying a patch that is now included in all versions of Nginx that Nixpkgs supports.
This commit is contained in:
Elliot Cameron 2024-04-16 23:18:30 -04:00
parent edd8117bfa
commit 99afffdc3a
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 ]; inputs = [ luajit_openresty ];
preConfigure = let preConfigure = ''
# 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 ''
export LUAJIT_LIB="${luajit_openresty}/lib" export LUAJIT_LIB="${luajit_openresty}/lib"
export LUAJIT_INC="$(realpath ${luajit_openresty}/include/luajit-*)" export LUAJIT_INC="$(realpath ${luajit_openresty}/include/luajit-*)"
@ -399,7 +393,6 @@ let self = {
lua_src=$TMPDIR/lua-src lua_src=$TMPDIR/lua-src
cp -r "${src}/" "$lua_src" cp -r "${src}/" "$lua_src"
chmod -R +w "$lua_src" chmod -R +w "$lua_src"
patch -p1 -d $lua_src -i ${nginx-1-23-patch}
export configureFlags="''${configureFlags//"${src}"/"$lua_src"}" export configureFlags="''${configureFlags//"${src}"/"$lua_src"}"
unset lua_src unset lua_src
''; '';