b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

rPackages: added libiconv to darwin builds and removed redundant package level calls

Browse source
This commit is contained in:
Nathan Viets 2023-02-05 20:50:38 -06:00 committed by Justin Bedo
parent 28116031e2
commit 3f5c9df651
No known key found for this signature in database
GPG key ID: 2C18202C56C182BD
2 changed files with 4 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/development/r-modules/default.nix
View file

@ -325,7 +325,6 @@ let
Cardinal = [ pkgs.which ];
chebpol = [ pkgs.fftw.dev ];
ChemmineOB = with pkgs; [ openbabel pkg-config ];
classInt = lib.optional stdenv.isDarwin [ pkgs.libiconv ];
curl = [ pkgs.curl.dev ];
data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
devEMF = with pkgs; [ xorg.libXft.dev ];
@ -344,7 +343,7 @@ let
graphscan = [ pkgs.gsl ];
gsl = [ pkgs.gsl ];
gert = [ pkgs.libgit2 ];
haven = with pkgs; [ libiconv zlib.dev ];
haven = with pkgs; [ zlib.dev ];
h5vc = [ pkgs.zlib.dev ];
HiCseg = [ pkgs.gsl ];
imager = [ pkgs.xorg.libX11.dev ];
@ -363,7 +362,7 @@ let
mwaved = [ pkgs.fftw.dev ];
mzR = with pkgs; [ zlib netcdf ];
ncdf4 = [ pkgs.netcdf ];
nloptr = with pkgs; [ nlopt pkg-config libiconv ];
nloptr = with pkgs; [ nlopt pkg-config ];
n1qn1 = [ pkgs.gfortran ];
odbc = [ pkgs.unixODBC ];
pander = with pkgs; [ pandoc which ];
@ -379,7 +378,6 @@ let
RAppArmor = [ pkgs.libapparmor ];
rapportools = [ pkgs.which ];
rapport = [ pkgs.which ];
readxl = [ pkgs.libiconv ];
rcdd = [ pkgs.gmp.dev ];
RcppCNPy = [ pkgs.zlib.dev ];
RcppGSL = [ pkgs.gsl ];
@ -499,15 +497,6 @@ let
packagesWithBuildInputs = {
# sort -t '=' -k 2
deldir = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
gam = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
interp = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
RcppArmadillo = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
quantreg = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
rmutil = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
robustbase = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
SparseM = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
hexbin = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
svKomodo = [ pkgs.which ];
nat = [ pkgs.which ];
nat_templatebrains = [ pkgs.which ];
@ -516,7 +505,6 @@ let
clustermq = [ pkgs.pkg-config ];
RMark = [ pkgs.which ];
RPushbullet = [ pkgs.which ];
RcppEigen = [ pkgs.libiconv ];
RCurl = [ pkgs.curl.dev ];
R2SWF = [ pkgs.pkg-config ];
rgl = with pkgs; [ libGLU libGLU.dev libGL xorg.libX11.dev freetype.dev libpng.dev ];
@ -555,25 +543,6 @@ let
tikzDevice = with pkgs; [ which texlive.combined.scheme-medium ];
gridGraphics = [ pkgs.which ];
adimpro = with pkgs; [ which xorg.xdpyinfo ];
cluster = [ pkgs.libiconv ];
KernSmooth = [ pkgs.libiconv ];
nlme = [ pkgs.libiconv ];
Matrix = [ pkgs.libiconv ];
mgcv = [ pkgs.libiconv ];
minqa = [ pkgs.libiconv ];
igraph = [ pkgs.libiconv ];
ape = [ pkgs.libiconv ];
expm = [ pkgs.libiconv ];
mnormt = [ pkgs.libiconv ];
pan = [ pkgs.libiconv ];
phangorn = [ pkgs.libiconv ];
quadprog = [ pkgs.libiconv ];
randomForest = [ pkgs.libiconv ];
sundialr = [ pkgs.libiconv ];
ucminf = [ pkgs.libiconv ];
glmnet = [ pkgs.libiconv ];
mvtnorm = [ pkgs.libiconv ];
statmod = [ pkgs.libiconv ];
rsvg = [ pkgs.librsvg.dev ];
ssh = with pkgs; [ libssh ];
s2 = [ pkgs.openssl.dev ];

4
pkgs/development/r-modules/generic-builder.nix
View file

@ -1,11 +1,11 @@
{ stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran }:
{ stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran, libiconv }:
{ name, buildInputs ? [], requireX ? false, ... } @ attrs:
stdenv.mkDerivation ({
buildInputs = buildInputs ++ [R gettext] ++
lib.optionals requireX [util-linux xvfb-run] ++
lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];
lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran libiconv];
NIX_CFLAGS_COMPILE =
lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";