diff options
| author | Justin Bedo <cu@cua0.org> | 2023-09-15 14:08:30 +1000 |
|---|---|---|
| committer | Justin Bedo <cu@cua0.org> | 2023-09-15 14:08:30 +1000 |
| commit | 6e903b7b7e0648ce7b22aa4ae1cf054afeafa56f (patch) | |
| tree | 555b404936faaed6e27ee4f83ba1038f42b1a44a /pkgs/development/r-modules | |
| parent | 5d866fe3fb9e68eb53d57deb18c39fb194ba3fab (diff) | |
rPackages.pandoc: fix pandoc linking
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index c6687172452a..60aaf0de1eb8 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -603,7 +603,6 @@ let ncdfFlow = [ pkgs.zlib.dev ]; proj4 = [ pkgs.proj.dev ]; rtmpt = [ pkgs.gsl ]; - rmarkdown = [ pkgs.pandoc ]; mixcat = [ pkgs.gsl ]; libstableR = [ pkgs.gsl ]; landsepi = [ pkgs.gsl ]; @@ -1362,6 +1361,13 @@ let patches = [ ./patches/rhdf5.patch ]; }); + rmarkdown = old.rmarkdown.overrideAttrs (_: { + preConfigure = '' + substituteInPlace R/pandoc.R \ + --replace '"~/opt/pandoc"' '"~/opt/pandoc", "${pkgs.pandoc}/bin"' + ''; + }); + redland = old.redland.overrideAttrs (_: { PKGCONFIG_CFLAGS="-I${pkgs.redland}/include -I${pkgs.librdf_raptor2}/include/raptor2 -I${pkgs.librdf_rasqal}/include/rasqal"; PKGCONFIG_LIBS="-L${pkgs.redland}/lib -L${pkgs.librdf_raptor2}/lib -L${pkgs.librdf_rasqal}/lib -lrdf -lraptor2 -lrasqal"; |