jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-19 17:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove node-pre-gyp patch that is no longer needed with electron 6

Browse Source 
Changelog-entry: Remove node-pre-gyp patch that is no longer needed with electron 6
Change-type: patch
This commit is contained in:
Alexis Svinartchouk 2019-10-10 14:10:30 +02:00
parent d071bf8ade
commit 9488468b67
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch
View File

@ -1,28 +0,0 @@
--- a/node_modules/node-pre-gyp/lib/util/versioning.js
+++ b/node_modules/node-pre-gyp/lib/util/versioning.js
@@ -80,7 +80,14 @@ function get_runtime_abi(runtime, target_version) {
if (runtime === 'node-webkit') {
return get_node_webkit_abi(runtime, target_version || process.versions['node-webkit']);
} else if (runtime === 'electron') {
- return get_electron_abi(runtime, target_version || process.versions.electron);
+ var electron_version = target_version || process.versions.electron;
+ if (!electron_version) {
+ // TODO PR something to electron to pass in the version number for forks
+ // https://github.com/electron/electron/issues/9058
+ try { electron_version = require('electron/package.json').version; }
+ catch (_) { electron_version = '6.0.10'; }
+ }
+ return get_electron_abi(runtime, electron_version);
} else {
if (runtime != 'node') {
throw new Error("Unknown Runtime: '" + runtime + "'");
@@ -263,7 +270,8 @@ function get_process_runtime(versions) {
var runtime = 'node';
if (versions['node-webkit']) {
runtime = 'node-webkit';
- } else if (versions.electron) {
+ } else if (versions.electron || process.env.ELECTRON_RUN_AS_NODE) {
+ // Running in electron or a childProcess.fork of electron
runtime = 'electron';
}
return runtime;