diff options
| author | solaraquarion | 2021-02-28 21:50:59 -0500 |
|---|---|---|
| committer | solaraquarion | 2021-02-28 21:50:59 -0500 |
| commit | cc10136e6acc9fd7a75d5fcca8c5f112c1fd3256 (patch) | |
| tree | c55c230ad2d43e746d697ee18ebd97a62f51909e /use-system-apm.patch | |
| parent | 18124e22e8e846852643001999e9092c39784a4d (diff) | |
| download | aur-cc10136e6acc9fd7a75d5fcca8c5f112c1fd3256.tar.gz | |
Revert "attempt to bring package up to date"
This reverts commit 49dda0eb05df1c804f22e7036cb262f0e339b506.
Diffstat (limited to 'use-system-apm.patch')
| -rw-r--r-- | use-system-apm.patch | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/use-system-apm.patch b/use-system-apm.patch index 428973ad1fbf..9cbcf8c75fb6 100644 --- a/use-system-apm.patch +++ b/use-system-apm.patch @@ -1,31 +1,20 @@ -From 53b8342d6e4f89e63f2e7a31481fc52b2868224b Mon Sep 17 00:00:00 2001 -From: solaraquarion <shlomochoina@gmail.com> -Date: Sun, 28 Feb 2021 19:14:47 -0500 -Subject: [PATCH 3/3] use system apm - ---- - script/lib/run-apm-install.js | 2 +- - src/package-manager.js | 14 +------------- - 2 files changed, 2 insertions(+), 14 deletions(-) - -diff --git a/script/lib/run-apm-install.js b/script/lib/run-apm-install.js -index f582ff471..72bec210c 100644 --- a/script/lib/run-apm-install.js +++ b/script/lib/run-apm-install.js -@@ -9,7 +9,7 @@ module.exports = function(packagePath, ci, stdioOptions) { +@@ -8,10 +8,7 @@ + const installEnv = Object.assign({}, process.env); // Set resource path so that apm can load metadata related to Atom. installEnv.ATOM_RESOURCE_PATH = CONFIG.repositoryRootPath; - +- // Set our target (Electron) version so that node-pre-gyp can download the +- // proper binaries. +- installEnv.npm_config_target = CONFIG.appMetadata.electronVersion; - childProcess.execFileSync(CONFIG.getApmBinPath(), [ci ? 'ci' : 'install'], { + childProcess.execFileSync('apm', [ci ? 'ci' : 'install'], { env: installEnv, cwd: packagePath, stdio: stdioOptions || 'inherit' -diff --git a/src/package-manager.js b/src/package-manager.js -index 775916ad6..a75b84ea4 100644 --- a/src/package-manager.js +++ b/src/package-manager.js -@@ -194,19 +194,7 @@ module.exports = class PackageManager { +@@ -194,19 +194,7 @@ return configPath || this.apmPath; } @@ -46,6 +35,3 @@ index 775916ad6..a75b84ea4 100644 } // Public: Get the paths being used to look for packages. --- -2.30.1 - |