From f6e94961765802e246df1c925d52358fb9f41ed3 Mon Sep 17 00:00:00 2001 From: Dominic Steinitz Date: Mon, 25 Sep 2023 09:39:56 +0100 Subject: Make rPackage.sf build fixes 257221 --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/r-modules/default.nix') diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 60aaf0de1eb..853469be7ee 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 ]; -- cgit 1.4.1 From bcbe587526652810ed5d6f0c8896bf42df6f52dc Mon Sep 17 00:00:00 2001 From: nviets Date: Wed, 18 Oct 2023 14:44:33 -0500 Subject: rPackages.quarto: add quarto to propagatedBuildInputs --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/r-modules/default.nix') diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 853469be7ee..8d20ce0b286 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -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')" -- cgit 1.4.1 From b0a0f9856dfdc2348520e4b152ec77e5e7a44858 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 26 Oct 2023 21:24:21 +1100 Subject: rPackages.httpuv: fix build --- pkgs/development/r-modules/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/development/r-modules/default.nix') diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 8d20ce0b286..61b155993ec 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1378,6 +1378,12 @@ let env.NIX_LDFLAGS = "-lfribidi -lharfbuzz"; }); + httpuv = old.httpuv.overrideAttrs (_: { + preConfigure = '' + patchShebangs configure + ''; + }); + ijtiff = old.ijtiff.overrideAttrs (_: { preConfigure = '' patchShebangs configure -- cgit 1.4.1 From 2a0440c2a40338e7f6e223093dd40acc27f77353 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sat, 4 Nov 2023 20:02:28 +0000 Subject: rPackages: replace texlive.combined.scheme-medium with texliveMedium --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/r-modules/default.nix') diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 8d20ce0b286..d9c52caa089 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -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 ]; -- cgit 1.4.1