diff options
Diffstat (limited to 'nixpkgs/pkgs/development/r-modules/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/r-modules/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix index a9bb3487813..990a8fb85de 100644 --- a/nixpkgs/pkgs/development/r-modules/default.nix +++ b/nixpkgs/pkgs/development/r-modules/default.nix @@ -249,7 +249,7 @@ let ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; cit = [ pkgs.gsl_1 ]; curl = [ pkgs.curl.dev ]; - data_table = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; + data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ]; diversitree = [ pkgs.gsl_1 pkgs.fftw ]; EMCluster = [ pkgs.liblapack ]; @@ -276,7 +276,6 @@ let jqr = [ pkgs.jq.dev ]; KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; - libamtrack = [ pkgs.gsl_1 ]; magick = [ pkgs.imagemagick.dev ]; mvabund = [ pkgs.gsl_1 ]; mwaved = [ pkgs.fftw.dev ]; @@ -325,7 +324,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 ]; @@ -358,6 +357,7 @@ let stringi = [ pkgs.icu.dev ]; survSNP = [ pkgs.gsl_1 ]; sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ]; + systemfonts = [ pkgs.fontconfig.dev pkgs.freetype.dev ]; TAQMNGR = [ pkgs.zlib.dev ]; tesseract = [ pkgs.tesseract pkgs.leptonica ]; tiff = [ pkgs.libtiff.dev ]; @@ -425,6 +425,7 @@ let spate = [ pkgs.pkgconfig ]; stringi = [ pkgs.pkgconfig ]; sysfonts = [ pkgs.pkgconfig ]; + systemfonts = [ pkgs.pkgconfig ]; tesseract = [ pkgs.pkgconfig ]; Cairo = [ pkgs.pkgconfig ]; Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; @@ -647,7 +648,6 @@ let "SimpleTable" "SOLOMON" "soundecology" - "SPACECAP" "spacodiR" "spatsurv" "sqldf" @@ -814,7 +814,7 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - MYSQL_DIR=pkgs.mysql.connector-c; + MYSQL_DIR="${pkgs.libmysqlclient}"; preConfigure = '' patchShebangs configure ''; @@ -949,6 +949,10 @@ let preConfigure = "patchShebangs configure"; }); + systemfonts = old.systemfonts.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + littler = old.littler.overrideAttrs (attrs: with pkgs; { buildInputs = [ pcre lzma zlib bzip2 icu which ] ++ attrs.buildInputs; postInstall = '' |