summary refs log tree commit diff
path: root/pkgs/development/r-modules
diff options
context:
space:
mode:
authorIzorkin <izorkin@elven.pw>2019-08-17 21:24:29 +0300
committerIzorkin <izorkin@elven.pw>2019-09-09 15:55:34 +0300
commit329a88efa78126ae7413807ce58000eab49e82d9 (patch)
tree432995643b4784e5eefdd253ace54a2566eebd7c /pkgs/development/r-modules
parentcfb909229dd4c82441ddbf6d904def2057b62678 (diff)
downloadnixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar
nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar.gz
nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar.bz2
nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar.lz
nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar.xz
nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar.zst
nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.zip
treewide: replace mysql.connector-c to libmysqlclient
Diffstat (limited to 'pkgs/development/r-modules')
-rw-r--r--pkgs/development/r-modules/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1616eacffc6..cef7f0aecf2 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.mysql.connector-c pkgs.openssl.dev ];
+    RMySQL = [ pkgs.zlib pkgs.libmysqlclient 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.mysql.connector-c;
+      MYSQL_DIR="${pkgs.libmysqlclient}";
       preConfigure = ''
         patchShebangs configure
       '';