mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 17:14:33 +00:00
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
--- a/src/gwt/build.xml
|
|
+++ b/src/gwt/build.xml
|
|
@@ -83,24 +83,7 @@
|
|
<echo>Concatenated acesupport files to 'acesupport.js'</echo>
|
|
</target>
|
|
|
|
- <!-- panmirror typescript library -->
|
|
- <!-- ensure version matches RSTUDIO_NODE_VERSION -->
|
|
- <property name="node.version" value="16.14.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="@node@/bin/node"/>
|
|
|
|
<property name="panmirror.dir" value="./panmirror/src/editor"/>
|
|
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
|
|
|