Skip to content

Commit

Permalink
obs-scripting: Fix macOS Homebrew Python loading
Browse files Browse the repository at this point in the history
  • Loading branch information
jcm93 committed Dec 16, 2024
1 parent 10dc43b commit 604d4a4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions shared/obs-scripting/obs-scripting-python-import.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#define PATH_MAX MAX_PATH
#elif __APPLE__
#define VERSION_PATTERN "%d.%d"
#define FILE_PATTERN "Python.framework/Versions/Current/lib/libpython%s.dylib"
#define FILE_PATTERN "Python.framework/Versions/%s/lib/libpython%s.dylib"
#endif

#define PY_MAJOR_VERSION_MAX 3
Expand Down Expand Up @@ -71,7 +71,7 @@ bool import_python(const char *python_path, python_version_t *python_version)

struct dstr temp;
dstr_init(&temp);
dstr_printf(&temp, FILE_PATTERN, cur_version);
dstr_printf(&temp, FILE_PATTERN, cur_version, cur_version);

int minor_version = PY_MINOR_VERSION_MAX;
do {
Expand Down
3 changes: 2 additions & 1 deletion shared/obs-scripting/obs-scripting-python.c
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,8 @@ bool obs_scripting_load_python(const char *python_path)
if (python_path && *python_path) {
#ifdef __APPLE__
char temp[PATH_MAX];
snprintf(temp, sizeof(temp), "%s/Python.framework/Versions/Current", python_path);
snprintf(temp, sizeof(temp), "%s/Python.framework/Versions/%i.%i", python_path, python_version.major,
python_version.minor);
os_utf8_to_wcs(temp, 0, home_path, PATH_MAX);
Py_SetPythonHome(home_path);
#else
Expand Down

0 comments on commit 604d4a4

Please sign in to comment.