nixpkgs/pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch
Goetz f76ab1db42
RStudio: 2022.02.3+492 -> 2022.07.1.+554 (#185154)
RStudio: 2022.02.3+492 -> 2022.07.1.+554

Separate quarto fix and pandoc installation
2022-09-20 11:24:19 +02:00

33 lines
931 B
Diff

--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -43,12 +43,6 @@
set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27")
endif()
- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto")
- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto")
- else()
- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto")
- endif()
-
endif()
@@ -67,14 +61,7 @@
# validate our dependencies exist
foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
RSTUDIO_DEPENDENCIES_MATHJAX_DIR
- RSTUDIO_DEPENDENCIES_PANDOC_DIR
- RSTUDIO_DEPENDENCIES_QUARTO_DIR)
-
-
- # skip quarto if not enabled
- if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED)
- continue()
- endif()
+ RSTUDIO_DEPENDENCIES_PANDOC_DIR)
# validate existence
if(NOT EXISTS "${${VAR}}")