forked from guix-science/guix-science
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathrstudio-server-2021.09.0+351-unbundle.patch
38 lines (33 loc) · 1.49 KB
/
rstudio-server-2021.09.0+351-unbundle.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
commit 67717d392e1bb6641874ac298a0f9c865da4dc68
Author: Lars-Dominik Braun <[email protected]>
Date: Fri Jun 11 11:15:40 2021 +0200
Unbundle MathJax and Pandoc
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
index a80e62fa84..a19bdc4609 100644
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -48,9 +48,7 @@ else()
endif()
# validate our dependencies exist
-foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
- RSTUDIO_DEPENDENCIES_MATHJAX_DIR
- RSTUDIO_DEPENDENCIES_PANDOC_DIR)
+foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR)
# validate existence
if(NOT EXISTS "${${VAR}}")
@@ -587,16 +585,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD)
install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}"
DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
- # install mathjax for local html preview
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}"
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
-
- # install pandoc
- file(GLOB PANDOC_FILES "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/pandoc*")
- install(FILES ${PANDOC_FILES}
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc")
-
# install embedded packages
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")