fixup: allow for nodeGyp to be passed as an option

Author: wraithgar

lib/make-spawn-args.js

@@ -1,7 +1,6 @@
 /* eslint camelcase: "off" */
 const setPATH = require('./set-path.js')
 const { resolve } = require('path')
-const npm_config_node_gyp = require.resolve('node-gyp/bin/node-gyp.js')
 
 const makeSpawnArgs = options => {
   const {
@@ -14,16 +13,28 @@ const makeSpawnArgs = options => {
     cmd,
     args,
     stdioString,
+    nodeGyp,
   } = options
 
+  if (nodeGyp) {
+    // npm already pulled this from env and passes it in to options
+    npm_config_node_gyp = nodeGyp
+  } else if (env.npm_config_node_gyp) {
+    // legacy mode for standalone user
+    npm_config_node_gyp = env.npm_config_node_gyp
+  } else {
+    // default
+    npm_config_node_gyp = require.resolve('node-gyp/bin/node-gyp.js')
+  }
+
   const spawnEnv = setPATH(path, binPaths, {
     // we need to at least save the PATH environment var
     ...process.env,
     npm_package_json: resolve(path, 'package.json'),
     npm_lifecycle_event: event,
     npm_lifecycle_script: cmd,
-    npm_config_node_gyp,
     ...env,
+    npm_config_node_gyp,
   })
 
   const spawnOpts = {