averello/mailspring-mirror
1
0
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-12-12 20:36:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add an env var for running Intel builds on MacOS Silicon

Browse Source
This commit is contained in:
Ben Gotow
2025-09-14 13:08:25 -05:00
parent 11a7a6c961
commit 7dfa97473f
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/build/tasks/create-mac-zip.js
View File

@@ -15,7 +15,12 @@ module.exports = grunt => {
}
const orig = process.cwd();
process.chdir(path.join(grunt.config('outputDir'), `Mailspring-darwin-${process.arch}`));
process.chdir(
path.join(
grunt.config('outputDir'),
`Mailspring-darwin-${process.env.OVERRIDE_TO_INTEL ? 'x64' : process.arch}`
)
);
spawn(
{

1
app/build/tasks/package-task.js
View File

@@ -133,6 +133,7 @@ module.exports = grunt => {
tmpdir: tmpdir,
arch: {
win32: 'x64',
darwin: process.env.OVERRIDE_TO_INTEL ? 'x64' : process.arch,
}[platform],
icon: {
darwin: path.resolve(

4
app/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "mailspring",
"version": "1.15.1",
"version": "1.16.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "mailspring",
"version": "1.15.1",
"version": "1.16.0",
"license": "GPL-3.0",
"dependencies": {
"@bengotow/slate-edit-list": "github:bengotow/slate-edit-list#b868e108",

4
scripts/postinstall.js
View File

@@ -16,8 +16,8 @@ const npmEnvs = {
system: process.env,
electron: Object.assign({}, process.env, {
npm_config_target: npmElectronTarget,
npm_config_arch: process.arch,
npm_config_target_arch: process.arch,
npm_config_arch: process.env.OVERRIDE_TO_INTEL ? 'x64' : process.arch,
npm_config_target_arch: process.env.OVERRIDE_TO_INTEL ? 'x64' : process.arch,
npm_config_disturl: 'https://electronjs.org/headers',
npm_config_runtime: 'electron',
npm_config_build_from_source: true,