From 4363f16d8fc29ed6c177c8b28901801d8b0a3d10 Mon Sep 17 00:00:00 2001 From: teto sse Date: Sat, 30 Mar 2024 13:26:11 +0100 Subject: [PATCH] luaPackages.luadbi-mysql: fix overrides => fix build we previously dropped the generated config, thus breaking the build --- pkgs/development/lua-modules/overrides.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index a397e59b8922..e470bef93aad 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -321,10 +321,13 @@ with prev; }); luadbi-mysql = prev.luadbi-mysql.overrideAttrs (oa: { - luarocksConfig.variables = { - # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' - MYSQL_INCDIR = "${libmysqlclient.dev}/include/mysql"; - MYSQL_LIBDIR = "${libmysqlclient}/lib/mysql"; + + luarocksConfig = lib.recursiveUpdate oa.luarocksConfig { + variables = { + # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' + MYSQL_INCDIR = "${libmysqlclient.dev}/include/mysql"; + MYSQL_LIBDIR = "${libmysqlclient}/lib/mysql"; + }; }; buildInputs = oa.buildInputs ++ [ mariadb.client