Skip to content
Snippets Groups Projects
Commit f4dd8aae authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/denittis/t19989_locale' into 'master'

Bind the host's locale if we already use libc from the host

See merge request steam/pressure-vessel!39
parents a5b3da2c 123ec291
No related branches found
No related tags found
No related merge requests found
...@@ -1059,6 +1059,7 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self, ...@@ -1059,6 +1059,7 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self,
gboolean any_architecture_works = FALSE; gboolean any_architecture_works = FALSE;
g_autofree gchar *localedef = NULL; g_autofree gchar *localedef = NULL;
g_autofree gchar *ldconfig = NULL; g_autofree gchar *ldconfig = NULL;
g_autofree gchar *locale = NULL;
g_autofree gchar *dir_on_host = NULL; g_autofree gchar *dir_on_host = NULL;
g_autoptr(SrtSystemInfo) system_info = srt_system_info_new (NULL); g_autoptr(SrtSystemInfo) system_info = srt_system_info_new (NULL);
g_autoptr(SrtObjectList) egl_icds = NULL; g_autoptr(SrtObjectList) egl_icds = NULL;
...@@ -1585,6 +1586,23 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self, ...@@ -1585,6 +1586,23 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self,
NULL); NULL);
} }
locale = g_find_program_in_path ("locale");
if (locale == NULL)
{
g_warning ("Cannot find locale in PATH");
}
else
{
g_autofree gchar *target = g_build_filename ("/run/host",
locale, NULL);
flatpak_bwrap_add_args (bwrap,
"--symlink", target,
"/overrides/bin/locale",
NULL);
}
ldconfig = g_find_program_in_path ("ldconfig"); ldconfig = g_find_program_in_path ("ldconfig");
if (ldconfig == NULL) if (ldconfig == NULL)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment