Merge staging-next into staging

2026-01-27 00:20:54 +00:00
parent 4ee546b9c8 9d61acaa80
commit 00de339ee5
161 changed files with 7306 additions and 4195 deletions
@@ -469,6 +469,13 @@ in
    buildInputs = old.buildInputs ++ [
      yajl
    ];
+    luarocksConfig = old.luarocksConfig // {
+      variables = {
+        # Since yajl's outputs are split, we need to help luarocks find the
+        # include directory.
+        YAJL_INCDIR = "${lib.getDev yajl}/include";
+      };
+    };
  });

  lua-zlib = prev.lua-zlib.overrideAttrs (old: {