aboutsummaryrefslogtreecommitdiff
path: root/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2019-02-21 20:03:16 -0500
committerworldofpeace <worldofpeace@users.noreply.github.com>2019-02-22 12:44:29 -0500
commit255185cc655c9279aab6d1bfce22781346efa829 (patch)
treeca7f49b2868d5518c69dfc6f52a12192ba3555a5 /pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
parent522b897edb801d309f36d069fa347889050d6b70 (diff)
gnome3.gnome-desktop: 3.30.2 -> 3.30.2.1
https://gitlab.gnome.org/GNOME/gnome-desktop/blob/2da71b79c8e2574ec5ba3075ad9c1a8d5fd1b7ec/NEWS
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch')
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch21
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
index 59191bddd9af..175118ac5ffd 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
@@ -1,19 +1,16 @@
--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -504,14 +504,10 @@
+@@ -536,10 +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", "/lib", "/lib",
-- "--ro-bind", "/lib64", "/lib64",
-+ "@bubblewrap_bin@",
-+ "--ro-bind", "/nix/store", "/nix/store",
- "--proc", "/proc",
- "--dev", "/dev",
-- "--symlink", "usr/bin", "/bin",
-- "--symlink", "usr/sbin", "/sbin",
- "--chdir", "/",
- "--setenv", "GIO_USE_VFS", "local",
- "--unshare-all",
+- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
+- NULL);
++ "@bubblewrap_bin@",
++ "--ro-bind", "/nix/store", "/nix/store",
++ NULL);
+
+ /* These directories might be symlinks into /usr/... */
+ for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++)