From 582a3eb970c0ada51570132da9e73920128cdd61 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Mon, 11 Apr 2022 09:40:43 +0200 Subject: [PATCH] vscode: update to 1.66.1 + fix issue with node-gyp compilation, which may also depend on npm --- srcpkgs/vscode/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 0b9efda224d0..3e3956fa5644 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.66.0 +version=1.66.1 revision=1 _electronver=13.6.7 _npmver=8.6.0 @@ -11,8 +11,8 @@ short_desc="Microsoft Code for Linux" maintainer="shizonic , Alex Lohr " license="MIT" homepage="https://code.visualstudio.com/" -distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" -checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7 +distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz" +checksum=243a25d7214ceba5abf510dc890c64a8cc36ccacd97f4b8c666b8b7bab9c5a28 nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then @@ -38,6 +38,9 @@ do_configure() { } do_build() { + # Update to a more recent npm version to fix some issues + npm install -g npm@${_npmver} + # 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. @@ -48,8 +51,7 @@ do_build() { --target=$_electronver \ --tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz - npm install -g npm@${_npmver} && \ - yarn install --ignore-engines --arch=x64 + yarn install --ignore-engines --arch=x64 export CFLAGS="$CFLAGS -I/usr/include/node" yarn run gulp vscode-linux-x64-min