diff options
| author | Robin Gloster <mail@glob.in> | 2017-07-09 17:43:03 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
| commit | ee1c85aee9ebbfc76c6fed31a868e4082e4bad13 (patch) | |
| tree | c5f1e90aa32da5c1502711f22845c8e22d1100c6 /pkgs/development/r-modules/default.nix | |
| parent | 9265012de647750d64e40c07bcc5ee6ccc56da6d (diff) | |
| download | nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar.gz nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar.bz2 nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar.lz nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar.xz nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar.zst nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.zip | |
mariadb: lib -> connector-c
Diffstat (limited to 'pkgs/development/r-modules/default.nix')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 76c0e522777..a435ee65e52 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -320,7 +320,7 @@ let rmatio = [ pkgs.zlib.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; Rmpi = [ pkgs.openmpi ]; - RMySQL = [ pkgs.zlib pkgs.mysql.lib pkgs.mariadb pkgs.openssl.dev ]; + RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; @@ -798,10 +798,10 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - MYSQL_DIR="${pkgs.mysql.lib}"; + MYSQL_DIR="${pkgs.mysql.connector-c}"; preConfigure = '' patchShebangs configure - ''; + ''; }); devEMF = old.devEMF.overrideDerivation (attrs: { |