summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Krüger <mkg20001@gmail.com>2021-09-13 13:50:35 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-09-13 12:51:07 +0000
commitf5fb1a308042c3805a3fba7d4082506e92adae79 (patch)
treeab70a901a7a3be04a47041fd3935620a538f8b0f
parentMerge #132287: jetty: 9.4.41.v20210516 -> 9.4.43.v20210629 (diff)
downloadnixpkgs-f5fb1a308042c3805a3fba7d4082506e92adae79.tar.gz
rPackages.RMySQL: fix package
(cherry picked from commit a286dc9ef2fcc0748796c460f4a3ca169801b160)
-rw-r--r--pkgs/development/r-modules/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index f16a6d0bb4aa..b239c32a890e 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -783,7 +783,9 @@ let
});
RMySQL = old.RMySQL.overrideDerivation (attrs: {
- MYSQL_DIR="${pkgs.libmysqlclient}";
+ MYSQL_DIR = "${pkgs.libmysqlclient}";
+ PKGCONFIG_CFLAGS = "-I${pkgs.libmysqlclient.dev}/include/mysql";
+ NIX_CFLAGS_LINK = "-L${pkgs.libmysqlclient}/lib/mysql -lmysqlclient";
preConfigure = ''
patchShebangs configure
'';