about summary refs log tree commit diff
path: root/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch')
-rw-r--r--nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch17
1 files changed, 12 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch b/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch
index a2b9bbd9f02b..2782a5a0d7a2 100644
--- a/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch
+++ b/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch
@@ -1,11 +1,18 @@
 --- a/src/cpp/session/include/session/SessionConstants.hpp
 +++ b/src/cpp/session/include/session/SessionConstants.hpp
-@@ -140,7 +140,7 @@
+@@ -142,13 +142,13 @@
+ #define kSessionTmpDir             "rstudio-rsession"
+ 
  #ifdef QUARTO_ENABLED
- # define kDefaultPandocPath        "bin/quarto/bin"
- #else
--# define kDefaultPandocPath        "bin/pandoc"
+-# define kDefaultPandocPath        "bin/quarto/bin/tools"
 +# define kDefaultPandocPath        "@pandoc@"
+ #else
+ # define kDefaultPandocPath        "bin/pandoc"
  #endif
  
- #define kDefaultQuartoPath         "bin/quarto"
+ #define kDefaultNodePath           "bin/node"
+-#define kDefaultQuartoPath         "bin/quarto"
++#define kDefaultQuartoPath         "@quarto@"
+ #define kDefaultRsclangPath        "bin/rsclang"
+ 
+ #ifdef _WIN32