nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 08:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

rPackages.RMySQL: fix dependencies

Browse Source
This commit is contained in:
TomaSajt
2026-07-11 00:36:28 +02:00
committed by Michael Daniels
parent 23547d9884
commit 999dbf3487
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,11 +440,7 @@ let
RDieHarder = [ pkgs.gsl ]; # for gsl-config
RGtk2 = [ pkgs.pkg-config ];
RJMCMCNucleosomes = [ pkgs.gsl ]; # for gsl-config
RMySQL = with pkgs; [
zlib
libmysqlclient
openssl.dev
];
RMySQL = [ pkgs.libmysqlclient ]; # for mysql_config
RNetCDF = with pkgs; [
netcdf
udunits
@@ -2030,17 +2026,6 @@ let
'';
});
RMySQL = old.RMySQL.overrideAttrs (attrs: {
env = (attrs.env or { }) // {
MYSQL_DIR = "${pkgs.libmysqlclient}";
PKGCONFIG_CFLAGS = "-I${pkgs.libmysqlclient.dev}/include/mysql";
NIX_CFLAGS_LINK = "-L${pkgs.libmysqlclient}/lib/mysql -lmysqlclient";
};
preConfigure = ''
patchShebangs configure
'';
});
ROracle = old.ROracle.overrideAttrs (attrs: {
configureFlags = [
"--with-oci-lib=${pkgs.oracle-instantclient.lib}/lib"