rPackages: fix evaluation

Removes uses of aliases
This commit is contained in:
Naïm Favier 2022-01-26 16:21:53 +01:00 committed by Jonathan Ringer
parent 8fec6ae388
commit 59be16611c

View File

@ -321,13 +321,13 @@ let
Biostrings = [ pkgs.zlib ];
bnpmr = [ pkgs.gsl ];
cairoDevice = [ pkgs.gtk2.dev ];
Cairo = with pkgs; [ libtiff libjpeg cairo.dev x11 fontconfig.lib ];
Cairo = with pkgs; [ libtiff libjpeg cairo.dev xlibsWrapper fontconfig.lib ];
Cardinal = [ pkgs.which ];
chebpol = [ pkgs.fftw ];
ChemmineOB = with pkgs; [ openbabel pkg-config ];
curl = [ pkgs.curl.dev ];
data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
devEMF = with pkgs; [ xorg.libXft.dev x11 ];
devEMF = with pkgs; [ xorg.libXft.dev xlibsWrapper ];
diversitree = with pkgs; [ gsl fftw ];
exactextractr = [ pkgs.geos ];
EMCluster = [ pkgs.lapack ];
@ -346,7 +346,7 @@ let
haven = with pkgs; [ libiconv zlib.dev ];
h5vc = [ pkgs.zlib.dev ];
HiCseg = [ pkgs.gsl ];
imager = [ pkgs.x11 ];
imager = [ pkgs.xlibsWrapper ];
iBMQ = [ pkgs.gsl ];
igraph = with pkgs; [ gmp libxml2.dev ];
JavaGD = [ pkgs.jdk ];
@ -644,7 +644,7 @@ let
PING = [ pkgs.gsl ];
RcppAlgos = [ pkgs.gmp.dev ];
RcppBigIntAlgos = [ pkgs.gmp.dev ];
HilbertVisGUI = [ pkgs.gnome2.gtkmm.dev ];
HilbertVisGUI = [ pkgs.gtkmm2.dev ];
textshaping = with pkgs; [ harfbuzz.dev freetype.dev fribidi libpng ];
DropletUtils = [ pkgs.zlib.dev ];
RMariaDB = [ pkgs.libmysqlclient.dev ];
@ -1114,7 +1114,7 @@ let
patchShebangs configure
'';
R_MAKEVARS_SITE = lib.optionalString (pkgs.system == "aarch64-linux")
R_MAKEVARS_SITE = lib.optionalString (pkgs.stdenv.system == "aarch64-linux")
(pkgs.writeText "Makevars" ''
CXX14PICFLAGS = -fPIC
'');