nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #255219 from jbedo/rmarkdown

Browse Source 
rPackages.pandoc: fix pandoc linking
This commit is contained in:
Artturi 2023-09-15 19:17:44 +03:00 committed by GitHub
commit bdc382d331
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/r-modules/default.nix
View File

@ -603,7 +603,6 @@ let
ncdfFlow = [ pkgs.zlib.dev ]; ncdfFlow = [ pkgs.zlib.dev ];
proj4 = [ pkgs.proj.dev ]; proj4 = [ pkgs.proj.dev ];
rtmpt = [ pkgs.gsl ]; rtmpt = [ pkgs.gsl ];
rmarkdown = [ pkgs.pandoc ];
mixcat = [ pkgs.gsl ]; mixcat = [ pkgs.gsl ];
libstableR = [ pkgs.gsl ]; libstableR = [ pkgs.gsl ];
landsepi = [ pkgs.gsl ]; landsepi = [ pkgs.gsl ];
@ -1362,6 +1361,13 @@ let
patches = [ ./patches/rhdf5.patch ]; 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 (_: { redland = old.redland.overrideAttrs (_: {
PKGCONFIG_CFLAGS="-I${pkgs.redland}/include -I${pkgs.librdf_raptor2}/include/raptor2 -I${pkgs.librdf_rasqal}/include/rasqal"; 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"; PKGCONFIG_LIBS="-L${pkgs.redland}/lib -L${pkgs.librdf_raptor2}/lib -L${pkgs.librdf_rasqal}/lib -lrdf -lraptor2 -lrasqal";