Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions lifecycleScripts/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ module.exports = function install() {
}

return new Promise(function(resolve, reject) {
const gypPath = path.join(__dirname, "..", "node_modules", "node-gyp", "bin", "node-gyp.js");
var spawnedNodePreGyp = spawn(nodePreGyp, args, {
env: Object.assign({}, process.env, {
npm_config_node_gyp: path.join(__dirname, "..", "node_modules",
"node-gyp", "bin", "node-gyp.js")
})
env: {
...process.env,
npm_config_node_gyp: gypPath
},
shell: process.platform === "win32"
Comment on lines +29 to +35
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is nodegit@c12c5a4

Perhaps we could also just pull in all 70 commits from nodegit/nodegit?

});

spawnedNodePreGyp.stdout.on("data", function(data) {
Expand Down Expand Up @@ -60,6 +62,6 @@ if (require.main === module) {
.catch(function(e) {
console.error("[nodegit] ERROR - Could not finish install");
console.error("[nodegit] ERROR - finished with error code: " + e);
process.exit(e);
process.exit(1);
});
}
Loading