colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #300221 from teto/teto/fix-luadbi-mysql

Browse Source 
luaPackages.luadbi-mysql: fix overrides => fix build
This commit is contained in:
Matthieu Coudron 2024-03-30 14:15:15 +01:00 committed by GitHub
commit e68863fa7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/lua-modules/overrides.nix
View File

@ -321,10 +321,13 @@ with prev;
}); });
luadbi-mysql = prev.luadbi-mysql.overrideAttrs (oa: { luadbi-mysql = prev.luadbi-mysql.overrideAttrs (oa: {
luarocksConfig.variables = {
# Can't just be /include and /lib, unfortunately needs the trailing 'mysql' luarocksConfig = lib.recursiveUpdate oa.luarocksConfig {
MYSQL_INCDIR = "${libmysqlclient.dev}/include/mysql"; variables = {
MYSQL_LIBDIR = "${libmysqlclient}/lib/mysql"; # 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 ++ [ buildInputs = oa.buildInputs ++ [
mariadb.client mariadb.client