diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
| commit | f8a8fc6c7c079de430fa528f688ddac781bcef16 (patch) | |
| tree | 08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/development/lua-modules | |
| parent | 6be720b3a756662bb31adfdc1948553a02057c16 (diff) | |
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing
changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1.
Let's delay this. We have some serious regressions.
Diffstat (limited to 'pkgs/development/lua-modules')
| -rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 41dae8347eed..233503c2eca8 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -154,12 +154,12 @@ with super; luadbi-mysql = super.luadbi-mysql.override({ extraVariables = '' -- Can't just be /include and /lib, unfortunately needs the trailing 'mysql' - MYSQL_INCDIR='${pkgs.libmysqlclient}/include/mysql'; - MYSQL_LIBDIR='${pkgs.libmysqlclient}/lib/mysql'; + MYSQL_INCDIR='${pkgs.mysql.connector-c}/include/mysql'; + MYSQL_LIBDIR='${pkgs.mysql.connector-c}/lib/mysql'; ''; buildInputs = [ pkgs.mysql.client - pkgs.libmysqlclient + pkgs.mysql.connector-c ]; }); |