mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 21:03:15 +00:00
217d974d84
Updates rstudio to current version, fixes plotting and enables quarto and markdown rendering. Visual mode for markdown editing is still not functional. * Remove unneeded patch * Eliminate false quarto version warning * Fix pandoc and quarto paths * Adjust patch name to reflect purpose * Remove panmirror for now * Update quartoSrc Co-authored-by: Justin Bedő <cu@cua0.org> Also contributed: b-rodrigues and kupac
19 lines
602 B
Diff
19 lines
602 B
Diff
--- a/src/cpp/session/include/session/SessionConstants.hpp
|
|
+++ b/src/cpp/session/include/session/SessionConstants.hpp
|
|
@@ -142,13 +142,13 @@
|
|
#define kSessionTmpDir "rstudio-rsession"
|
|
|
|
#ifdef QUARTO_ENABLED
|
|
-# define kDefaultPandocPath "bin/quarto/bin/tools"
|
|
+# define kDefaultPandocPath "@pandoc@"
|
|
#else
|
|
# define kDefaultPandocPath "bin/pandoc"
|
|
#endif
|
|
|
|
#define kDefaultNodePath "bin/node"
|
|
-#define kDefaultQuartoPath "bin/quarto"
|
|
+#define kDefaultQuartoPath "@quarto@"
|
|
#define kDefaultRsclangPath "bin/rsclang"
|
|
|
|
#ifdef _WIN32
|