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/18.18.2/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
  29 diff --git a/src/gwt/build.xml b/src/gwt/build.xml
  30 index 033d605..f1ee63d 100644
  31 --- a/src/gwt/build.xml
  32 +++ b/src/gwt/build.xml
  33 @@ -87,29 +87,7 @@
  34     <!-- ensure version matches RSTUDIO_NODE_VERSION -->
  35     <property name="node.version" value="18.18.2"/>
  36     <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
  37 -   <!-- use yarn from system but will prefer yarn from dependencies if available -->
  38 -   <condition property="yarn.bin" value="yarn">
  39 -     <not>
  40 -        <os family="windows" />
  41 -     </not>
  42 -   </condition>
  43 -   <available
  44 -      property="yarn.bin"
  45 -      value="${node.dir}/bin/yarn"
  46 -      file="${node.dir}/bin/yarn"/>
  47 -   <condition property="yarn.bin" value="${node.dir}/node_modules/yarn/bin/yarn.cmd">
  48 -     <os family="windows" />
  49 -   </condition>
  50 -   <!-- use yarn from /opt/rstudio-tools if installed (typical for Docker) -->
  51 -   <available
  52 -      property="yarn.bin"
  53 -      value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"
  54 -      file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"/>
  55 -   <!-- use yarn from c:/rstudio-tools if installed (typical for Docker on Windows) -->
  56 -   <available
  57 -      property="yarn.bin"
  58 -      value="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"
  59 -      file="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"/>
  60 +   <property name="node.bin" value="@node@/bin/node"/>
  61
  62     <property name="panmirror.dir" value="./lib/quarto/apps/panmirror"/>
  63     <property name="panmirror.build.dir" value="./www/js/panmirror"/>
  64 @@ -133,28 +111,11 @@
  65              <isset property="panmirror.minify" />
  66           </not>
  67        </condition>
  68 -
  69 -      <echo message="yarn location: ${yarn.bin}"/>
  70 -      <echo message="panmirror location: ${panmirror.dir}"/>
  71 -      <echo message="panmirror minify: ${panmirror.minify}"/>
  72 -
  73        <mkdir dir="${panmirror.build.dir}"/>
  74 -      <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
  75 -         <arg value="install"/>
  76 -         <arg value="--network-timeout"/>
  77 -         <arg value="240000"/>
  78 -      </exec>
  79 -      <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
  80 -         <arg value="build"/>
  81 -         <arg value="--minify"/>
  82 -         <arg value="${panmirror.minify}"/>
  83 -         <arg value="--sourcemap"/>
  84 -         <arg value="true"/>
  85 -         <env key="PANMIRROR_OUTDIR" value="dist-rstudio"/>
  86 +     <exec executable="${node.bin}" dir="${panmirror.dir}" spawn="${panmirror.spawn}">
  87 +          <arg value="fuse"/>
  88 +          <arg value="${panmirror.target}"/>
  89        </exec>
  90 -      <copy todir="${panmirror.build.dir}">
  91 -         <fileset dir="${panmirror.dir}/dist-rstudio"/>
  92 -      </copy>
  93     </target>
  94
  95     <target name="javac" description="Compile java source">
  96