b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

rPackages.pandoc: fix pandoc linking

Browse source
This commit is contained in:
Justin Bedo 2023-09-15 14:08:30 +10:00
parent 5d866fe3fb
commit 6e903b7b7e
No known key found for this signature in database
GPG key ID: 2C18202C56C182BD
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 ];
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";