pkgs/applications/editors/rstudio/use-system-quarto.patch

   1 --- a/src/cpp/session/CMakeLists.txt
   2 +++ b/src/cpp/session/CMakeLists.txt
   3 @@ -36,18 +36,14 @@
   4     else()
   5        set(RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR "${RSTUDIO_DEPENDENCIES_DIR}/dictionaries")
   6     endif()
   7 -
   8 +
   9     if(EXISTS "${RSTUDIO_TOOLS_ROOT}/mathjax-27")
  10        set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_TOOLS_ROOT}/mathjax-27")
  11     else()
  12        set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27")
  13     endif()
  14
  15 -   if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto")
  16 -      set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto")
  17 -   else()
  18 -      set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto")
  19 -   endif()
  20 +   set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "@quarto@")
  21
  22  endif()
  23
  24 @@ -56,7 +52,7 @@
  25  # - by default, we use quarto + quarto's bundled pandoc
  26  # - if quarto is not enabled, use pandoc fallback
  27  if(QUARTO_ENABLED)
  28 -   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools")
  29 +   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "@pandoc@/bin")
  30  elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
  31     set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
  32  else()
  33 @@ -66,11 +62,9 @@
  34
  35  # validate our dependencies exist
  36  foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
  37 -            RSTUDIO_DEPENDENCIES_MATHJAX_DIR
  38 -            RSTUDIO_DEPENDENCIES_PANDOC_DIR
  39 -            RSTUDIO_DEPENDENCIES_QUARTO_DIR)
  40 +            RSTUDIO_DEPENDENCIES_MATHJAX_DIR)
  41 +
  42
  43 -
  44     # skip quarto if not enabled
  45     if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED)
  46        continue()