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/r-modules/default.nix | |
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/r-modules/default.nix')
-rw-r--r-- | pkgs/development/r-modules/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index cef7f0aecf260..1616eacffc651 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -325,7 +325,7 @@ let rmatio = [ pkgs.zlib.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; Rmpi = [ pkgs.openmpi ]; - RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ]; + RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; @@ -810,7 +810,7 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - MYSQL_DIR="${pkgs.libmysqlclient}"; + MYSQL_DIR=pkgs.mysql.connector-c; preConfigure = '' patchShebangs configure ''; |