From d6fbbeff802ac3272c5966c6d949212f02c05f68 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Thu, 8 Dec 2016 15:26:33 -0400 Subject: [PATCH] chore: update npm configuration in `dependencies-npm.sh` (#961) - The Electron npm headers can now be downloaded from https://atom.io/download/electron - We can configure gyp to build from source by using the `npm_config_build_from_source` environment variable rather than having to pass `--build-from-source` Signed-off-by: Juan Cruz Viotti --- scripts/build/dependencies-npm.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/build/dependencies-npm.sh b/scripts/build/dependencies-npm.sh index 0e233150..9d70a356 100755 --- a/scripts/build/dependencies-npm.sh +++ b/scripts/build/dependencies-npm.sh @@ -81,12 +81,13 @@ if [ "$ARGV_TARGET_PLATFORM" == "electron" ]; then # Ensure native addons are compiled with the correct headers # See https://github.com/electron/electron/blob/master/docs/tutorial/using-native-node-modules.md - export npm_config_disturl=https://atom.io/download/atom-shell + export npm_config_disturl=https://atom.io/download/electron export npm_config_runtime=electron fi export npm_config_target=$ARGV_TARGET_VERSION +export npm_config_build_from_source=true if [ "$ARGV_ARCHITECTURE" == "x86" ]; then export npm_config_arch=ia32 @@ -94,7 +95,7 @@ else export npm_config_arch=$ARGV_ARCHITECTURE fi -INSTALL_OPTS="--build-from-source" +INSTALL_OPTS="" if [ "$ARGV_FORCE" == "true" ]; then INSTALL_OPTS="$INSTALL_OPTS --force"