tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1--- a/src/validate-icon.c
2+++ b/src/validate-icon.c
3@@ -254,7 +254,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 g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
10 g_autofree char* arg_input_fd = NULL;
11 char validate_icon[PATH_MAX + 1];
12@@ -276,8 +276,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_icon, validate_icon,
20 NULL);
21
22@@ -320,6 +319,9 @@ 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 ("GDK_PIXBUF_MODULE_FILE"))
27+ add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL);
28+
29 arg_input_fd = g_strdup_printf ("%d", input_fd);
30 add_args (args,
31 validate_icon,