From 54db2ad0061ffba046a678ba6a4e9683fbc22873 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 8 Sep 2024 01:08:54 +0200 Subject: [PATCH] feat(libubox): support for Lua 5.3 Signed-off-by: Raito Bezarius --- pkgs/libubox/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/libubox/default.nix b/pkgs/libubox/default.nix index 43b0377..3111ff2 100644 --- a/pkgs/libubox/default.nix +++ b/pkgs/libubox/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, - fetchgit, + fetchFromGitea, cmake, - lua5_1, + lua, json_c }: @@ -11,30 +11,32 @@ stdenv.mkDerivation rec { pname = "libubox"; version = "unstable-2024-04-09"; - src = fetchgit { - url = "https://git.openwrt.org/project/libubox.git"; - rev = "eb9bcb64185ac155c02cc1a604692c4b00368324"; - hash = "sha256-5KO2E+4pcDp/pe2+vjoQDmyMwCc0yKm847U4J6HjxyA="; + src = fetchFromGitea { + domain = "git.dgnum.eu"; + owner = "DGNum"; + repo = "libubox"; + rev = "1c4b2dc4c12848e1b70b11e1cb2139ca8f19c860"; + hash = "sha256-aPhGJ7viXQmnoQRY8DuRvtwtxSy+S4qPj1fBsK066Yc="; }; nativeBuildInputs = [ cmake - lua5_1 + lua ]; buildInputs = [ - lua5_1 + lua json_c ]; # Otherwise, CMake cannot find jsoncpp? - env.NIX_CFLAGS_COMPILE = toString [ "-I${json_c.dev}/include/json-c" "-D JSONC" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${json_c.dev}/include/json-c" "-D JSONC" "-D LUA_COMPAT_MODULE" ]; cmakeFlags = [ "-DBUILD_EXAMPLES=off" # TODO: it explode at install phase. "-DBUILD_LUA=on" - "-DLUAPATH=${placeholder "out"}/lib/lua" + "-DLUAPATH=${placeholder "out"}/lib/lua/${lua.luaversion}/" ]; meta = {