mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 07:05:13 +00:00
1f95c49331
rstudio: 1.4.1717 -> 2022.02.3+492 The old version does not compile with gcc11. Also the used nixos-22.05 libraries (R interpreter) have changed their interfaces that have to be also patched. Updating RStudio is useful. * Remove Quarto patch Follow review in https://github.com/NixOS/nixpkgs/pull/177021#pullrequestreview-1007625773 * Fix not FHS paths Create explicit nix path replacement of hard coded FHS paths for pandoc and nodejs.
12 lines
376 B
Diff
12 lines
376 B
Diff
--- a/src/cpp/session/include/session/SessionConstants.hpp
|
|
+++ b/src/cpp/session/include/session/SessionConstants.hpp
|
|
@@ -140,7 +140,7 @@
|
|
#ifdef QUARTO_ENABLED
|
|
# define kDefaultPandocPath "bin/quarto/bin"
|
|
#else
|
|
-# define kDefaultPandocPath "bin/pandoc"
|
|
+# define kDefaultPandocPath "@pandoc@"
|
|
#endif
|
|
|
|
#define kDefaultQuartoPath "bin/quarto"
|