void-packages/srcpkgs/rstudio/patches/0006-use-system-node.patch

41 lines
1.4 KiB
Diff

From d947a9e537fd5c0b2c1e9dd28867747b9bffa8fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Sat, 5 Jun 2021 18:32:16 +0200
Subject: [PATCH] use system node
---
src/gwt/build.xml | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/gwt/build.xml b/src/gwt/build.xml
index 8092344..d7889d1 100644
--- a/src/gwt/build.xml
+++ b/src/gwt/build.xml
@@ -82,22 +82,7 @@
</target>
<!-- panmirror typescript library -->
- <property name="node.version" value="10.19.0"/>
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
- <not>
- <os family="windows" />
- </not>
- </condition>
- <condition property="node.bin" value="${node.dir}/node.exe">
- <os family="windows" />
- </condition>
-
- <!-- use node from /opt/rstudio-tools if installed (typical for Docker) -->
- <available
- property="node.bin"
- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"
- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/>
+ <property name="node.bin" value="/usr/bin/node"/>
<property name="panmirror.dir" value="./panmirror/src/editor"/>
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
--
2.31.1