diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:21 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:48 +0100 |
commit | 048a4cd441a59cbf89defb18bb45c9f0b4429b35 (patch) | |
tree | f8f5850ff05521ab82d65745894714a8796cbfb6 /pkgs/development/r-modules/default.nix | |
parent | 030c5028b07afcedce7c5956015c629486cc79d9 (diff) | |
parent | 4c2d05dd6435d449a3651a6dd314d9411b5f8146 (diff) | |
download | nixpkgs-rootfs.tar nixpkgs-rootfs.tar.gz nixpkgs-rootfs.tar.bz2 nixpkgs-rootfs.tar.lz nixpkgs-rootfs.tar.xz nixpkgs-rootfs.tar.zst nixpkgs-rootfs.zip |
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/development/r-modules/default.nix')
-rw-r--r-- | pkgs/development/r-modules/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 60aaf0de1eb..1f94b2328ea 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -423,7 +423,7 @@ let seqinr = [ pkgs.zlib.dev ]; webp = [ pkgs.pkg-config ]; seqminer = with pkgs; [ zlib.dev bzip2 ]; - sf = with pkgs; [ gdal proj geos ]; + sf = with pkgs; [ gdal proj geos libtiff curl ]; terra = with pkgs; [ gdal proj geos ]; showtext = with pkgs; [ zlib libpng icu freetype.dev ]; simplexreg = [ pkgs.gsl ]; @@ -546,7 +546,7 @@ let AMOUNTAIN = [ pkgs.gsl ]; Rsymphony = with pkgs; [ pkg-config doxygen graphviz subversion ]; tcltk2 = with pkgs; [ tcl tk ]; - tikzDevice = with pkgs; [ which texlive.combined.scheme-medium ]; + tikzDevice = with pkgs; [ which texliveMedium ]; gridGraphics = [ pkgs.which ]; adimpro = with pkgs; [ which xorg.xdpyinfo ]; rsvg = [ pkgs.librsvg.dev ]; @@ -1032,6 +1032,7 @@ let }); quarto = old.quarto.overrideAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ pkgs.quarto ]; postPatch = '' substituteInPlace "R/quarto.R" \ --replace "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = NA)" "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = '${lib.getBin pkgs.quarto}/bin/quarto')" @@ -1377,6 +1378,12 @@ let env.NIX_LDFLAGS = "-lfribidi -lharfbuzz"; }); + httpuv = old.httpuv.overrideAttrs (_: { + preConfigure = '' + patchShebangs configure + ''; + }); + ijtiff = old.ijtiff.overrideAttrs (_: { preConfigure = '' patchShebangs configure |