rPackages.pandoc: fix pandoc linking
This commit is contained in:
parent
5d866fe3fb
commit
6e903b7b7e
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue