Commit 1a6c6200 authored by Thomas Holder's avatar Thomas Holder Committed by René de Hesselle
Browse files

Don't assume default XDG_DATA_DIRS on macOS

Fixes crash for builds with Homebrew or MacPorts if XDG_DATA_DIRS is not
defined. Doesn't affect our app bundle, because
set_macos_app_bundle_env() is called first and defines XDG_DATA_DIRS.
parent 335ed6e1
Pipeline #367431214 canceled with stages
in 6 minutes and 59 seconds
......@@ -75,6 +75,9 @@ static void set_themes_env()
// so we can just call it directly and modify XDG_DATA_DIRS later
auto data_dirs = Glib::get_system_data_dirs();
xdg_data_dirs = boost::join(data_dirs, G_SEARCHPATH_SEPARATOR_S);
#elif defined(__APPLE__)
// we don't know what the default is, differs for MacPorts, Homebrew, etc.
return;
#else
// initialize with glib default (don't call g_get_system_data_dirs; it's cached!)
xdg_data_dirs = "/usr/local/share/:/usr/share/";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment