public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mariadb: lib -> connector-c

Browse Source
This commit is contained in:
Robin Gloster
2017-07-09 17:43:03 +02:00
parent 9265012de6
commit ee1c85aee9
18 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/r-modules/default.nix
View File

@@ -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: {