diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 85043ff5cd..5effca0b6f 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -2,7 +2,7 @@ pkgname=vscode version=1.42.0 revision=1 -hostmakedepends="pkg-config python nodejs-lts yarn tar" +hostmakedepends="pkg-config python nodejs-lts-10 yarn tar" makedepends="libxkbfile-devel libsecret-devel" depends="libXtst libxkbfile nss dejavu-fonts-ttf" short_desc="Microsoft Code for Linux" @@ -13,20 +13,12 @@ distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" checksum=b2d1cc61127483590fc47a0f8336605da0bbe92b3011024c77b2c15b13a23c8e patch_args="-Np1" -broken="https://build.voidlinux.org/builders/x86_64_builder/builds/22897/steps/shell_3/logs/stdio" - # Due to electron -archs="i686 x86_64" +archs="x86_64" nostrip_files="code-oss" -# The default memory limit may be too low for current versions of node -# to successfully build vscode. This sets it to 4GB, but -# change this number if it still doesn't work for your system. -_mem_limit="--max_old_space_size=4095" - case "$XBPS_TARGET_MACHINE" in - i686) broken="https://build.voidlinux.org/builders/i686_builder/builds/10486/steps/shell_3/logs/stdio" - _ARCH="ia32";; + i686) _ARCH="i686";; x86_64) _ARCH="x64";; esac @@ -36,6 +28,11 @@ pre_build() { } do_build() { + # The default memory limit may be too low for current versions of node + # to successfully build vscode. This sets it to 4GB, but + # change this number if it still doesn't work for your system. + _mem_limit="--max_old_space_size=4095" + export NODE_OPTIONS="${_mem_limit}" yarn install --ignore-engines --arch=${_ARCH} yarn run gulp vscode-linux-${_ARCH}-min