gnome-desktop: cherry-pick nautilus sandbox changes

This commit is contained in:
Guillaume Maudoux 2019-02-24 00:28:10 +01:00
parent 02d3e97750
commit a3e440ca8b

View File

@ -1,16 +1,15 @@
--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
@@ -536,10 +536,9 @@ add_bwrap (GPtrArray *array,
@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array,
g_return_val_if_fail (script->s_infile != NULL, FALSE);
add_args (array,
- "bwrap",
- "--ro-bind", "/usr", "/usr",
- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
- NULL);
+ "@bubblewrap_bin@",
+ "--ro-bind", "/nix/store", "/nix/store",
+ NULL);
+ "@bubblewrap_bin@",
+ "--ro-bind", "/nix/store", "/nix/store",
+ "--ro-bind", "/run/current-system", "/run/current-system",
NULL);
/* These directories might be symlinks into /usr/... */
for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++)