about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2024-04-17 11:37:59 +0200
committerGitHub <noreply@github.com>2024-04-17 11:37:59 +0200
commite79a4cbd5cc5b3e2350c034251db10dbcf25727b (patch)
tree7d8a2a7265782783542e4e9c840c3e2565796d15
parentb15047c7563f32a0f6c5fe411f4e5bc72338a12f (diff)
parent99afffdc3a54612249e17a15f387d70b7f13f84f (diff)
Merge pull request #304704 from deshaw/upstream-fix-nginxModules.lua
-rw-r--r--pkgs/servers/http/nginx/modules.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 09d103bfa3b25..4d8a1daa81cbc 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -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
     '';