diff options
| author | Justin Bedo <cu@cua0.org> | 2022-02-09 10:25:07 +1100 |
|---|---|---|
| committer | Justin Bedo <cu@cua0.org> | 2022-02-09 10:25:07 +1100 |
| commit | 145172b2c41ad0198a012c4186ce3c56bcf52b4b (patch) | |
| tree | 5a138682421061a21f27327a48d40a13d9aaae14 /pkgs/development/r-modules | |
| parent | cb13e4e96d19b5011a8f3beb3f629a0ec379c3dc (diff) | |
| parent | 91094c90221b1e8fa354f9a964280408e0c869e1 (diff) | |
| download | nixpkgs-145172b2c41ad0198a012c4186ce3c56bcf52b4b.tar nixpkgs-145172b2c41ad0198a012c4186ce3c56bcf52b4b.tar.gz nixpkgs-145172b2c41ad0198a012c4186ce3c56bcf52b4b.tar.bz2 nixpkgs-145172b2c41ad0198a012c4186ce3c56bcf52b4b.tar.lz nixpkgs-145172b2c41ad0198a012c4186ce3c56bcf52b4b.tar.xz nixpkgs-145172b2c41ad0198a012c4186ce3c56bcf52b4b.tar.zst nixpkgs-145172b2c41ad0198a012c4186ce3c56bcf52b4b.zip | |
Merge remote-tracking branch 'origin/master' into r-updates
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 4768cf40234..e2f0c53f110 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -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 ]; @@ -1108,7 +1108,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 ''); |