about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Maudoux <guillaume.maudoux@uclouvain.be>2019-02-24 00:28:10 +0100
committerGuillaume Maudoux <guillaume.maudoux@uclouvain.be>2019-02-25 09:48:12 +0100
commita3e440ca8b8acc940070a37c95ac670f66740fac (patch)
treefd96a6fbb877433e4cd571172f095eefcd0b8c35
parent02d3e9775004974d2cb954ff98b2df64560dab15 (diff)
downloadnixlib-a3e440ca8b8acc940070a37c95ac670f66740fac.tar
nixlib-a3e440ca8b8acc940070a37c95ac670f66740fac.tar.gz
nixlib-a3e440ca8b8acc940070a37c95ac670f66740fac.tar.bz2
nixlib-a3e440ca8b8acc940070a37c95ac670f66740fac.tar.lz
nixlib-a3e440ca8b8acc940070a37c95ac670f66740fac.tar.xz
nixlib-a3e440ca8b8acc940070a37c95ac670f66740fac.tar.zst
nixlib-a3e440ca8b8acc940070a37c95ac670f66740fac.zip
gnome-desktop: cherry-pick nautilus sandbox changes
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch11
1 files changed, 5 insertions, 6 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 175118ac5ffd..6c5989896cb3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
@@ -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++)