pyrox.dev
rstudio: fix server node patching
+3
pkgs/applications/editors/rstudio/default.nix
+3
pkgs/applications/editors/rstudio/default.nix
···
145
145
--replace '@node@' ${nodejs} \
146
146
--replace './lib/quarto' ${quartoSrc}
147
147
148
+
substituteInPlace src/cpp/conf/rsession-dev.conf \
149
+
--replace '@node@' ${nodejs}
150
+
148
151
substituteInPlace src/cpp/core/libclang/LibClang.cpp \
149
152
--replace '@libclang@' ${llvmPackages.libclang.lib} \
150
153
--replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so
+29
-1
pkgs/applications/editors/rstudio/use-system-node.patch
+29
-1
pkgs/applications/editors/rstudio/use-system-node.patch
···
1
+
diff --git a/src/cpp/conf/rsession-dev.conf b/src/cpp/conf/rsession-dev.conf
2
+
index d18362b..98cdd4c 100644
3
+
--- a/src/cpp/conf/rsession-dev.conf
4
+
+++ b/src/cpp/conf/rsession-dev.conf
5
+
@@ -39,7 +39,7 @@ external-mathjax-path=${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}
6
+
external-pandoc-path=${RSTUDIO_DEPENDENCIES_PANDOC_DIR}
7
+
external-quarto-path=${RSTUDIO_DEPENDENCIES_QUARTO_DIR}
8
+
external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang
9
+
-external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/16.14.0/bin/node
10
+
+external-node-path=@node@/bin/node
11
+
12
+
# enable copilot
13
+
copilot-enabled=1
14
+
diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt
15
+
index 30dd638..cb4a645 100644
16
+
--- a/src/cpp/server/CMakeLists.txt
17
+
+++ b/src/cpp/server/CMakeLists.txt
18
+
@@ -250,10 +250,6 @@ if (UNIX AND NOT APPLE)
19
+
DESTINATION ${RSERVER_SYSTEMD_DIR})
20
+
21
+
# install node
22
+
- install(
23
+
- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_NODE_VERSION}/"
24
+
- DESTINATION "${RSTUDIO_INSTALL_BIN}/node"
25
+
- USE_SOURCE_PERMISSIONS)
26
+
27
+
elseif(APPLE)
28
+
1
29
diff --git a/src/gwt/build.xml b/src/gwt/build.xml
2
-
index 83e9433..f1ee63d 100644
30
+
index 033d605..f1ee63d 100644
3
31
--- a/src/gwt/build.xml
4
32
+++ b/src/gwt/build.xml
5
33
@@ -87,29 +87,7 @@