tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1--- a/src/validate-sound.c
2+++ b/src/validate-sound.c
3@@ -234,7 +234,7 @@ flatpak_get_bwrap (void)
4 static int
5 rerun_in_sandbox (int input_fd)
6 {
7- const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" };
8+ const char * const usrmerged_dirs[] = { };
9 int i;
10 g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
11 char validate_sound[PATH_MAX + 1];
12@@ -255,8 +255,7 @@ rerun_in_sandbox (int input_fd)
13 "--tmpfs", "/tmp",
14 "--proc", "/proc",
15 "--dev", "/dev",
16- "--ro-bind", "/usr", "/usr",
17- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
18+ "--ro-bind", "@storeDir@", "@storeDir@",
19 "--ro-bind", validate_sound, validate_sound,
20 NULL);
21
22@@ -299,6 +298,8 @@ rerun_in_sandbox (int input_fd)
23 if (g_getenv ("G_MESSAGES_PREFIXED"))
24 add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL);
25
26+ if (g_getenv ("GST_PLUGIN_SYSTEM_PATH_1_0"))
27+ add_args (args, "--setenv", "GST_PLUGIN_SYSTEM_PATH_1_0", g_getenv ("GST_PLUGIN_SYSTEM_PATH_1_0"), NULL);
28
29 arg_input_fd = g_strdup_printf ("%d", input_fd);
30 add_args (args, validate_sound, "--fd", arg_input_fd, NULL);