Merge pull request #588 from NordicSemiconductor/fix_crash_on_monterey

Fix crash on macOS Monterey
NordicSemiconductor · Oct 20, 2021 · ba0fe36 · ba0fe36
2 parents 4e23dab + e08bdf5
commit ba0fe36
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,8 @@
+## 3.7.2 - 2021-10-21
+This version is released only for macOS.
+### Fixed
+- Crash on macOS Monterey.
+
 ## 3.7.1 - 2021-09-08
 ### Added
 - Warning when launching outdated apps which are still using the old app

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nrfconnect",
-    "version": "3.7.1",
+    "version": "3.7.2",
     "description": "nRF Connect for PC",
     "repository": {
         "type": "git",

diff --git a/src/main/index.js b/src/main/index.js
@@ -41,6 +41,8 @@ require('./setUserDataDir');
 
 const { existsSync } = require('fs');
 const { resolve } = require('path');
+const semver = require('semver');
+const os = require('os');
 
 const { execPath } = process;
 
@@ -54,11 +56,17 @@ const nRFjprogSearchPath = [
 ].find(existsSync);
 
 if (nRFjprogSearchPath) {
+    const onMonterey =
+        os.platform() === 'darwin' && semver(os.release()).major >= 21;
+    const envVariableForLibPath = onMonterey
+        ? 'DYLD_LIBRARY_PATH'
+        : 'LD_LIBRARY_PATH';
+
     process.env.NRFJPROG_LIBRARY_PATH = nRFjprogSearchPath;
-    const original = process.env.LD_LIBRARY_PATH
-        ? `:${process.env.LD_LIBRARY_PATH}`
+    const original = process.env[envVariableForLibPath]
+        ? `:${process.env[envVariableForLibPath]}`
         : '';
-    process.env.LD_LIBRARY_PATH = `${nRFjprogSearchPath}${original}`;
+    process.env[envVariableForLibPath] = `${nRFjprogSearchPath}${original}`;
 }
 
 const { Menu, ipcMain, dialog, app: electronApp } = require('electron');