From 02d3e9775004974d2cb954ff98b2df64560dab15 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 22 Feb 2019 12:09:33 +0100 Subject: [PATCH 1/2] nautilus: fix thumbnail generation on NixOS --- pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch index 051b7618612c..e3ad75b869c8 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch @@ -1,6 +1,6 @@ --- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c +++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -514,14 +514,10 @@ add_bwrap (GPtrArray *array, +@@ -514,14 +514,11 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, @@ -8,8 +8,9 @@ - "--ro-bind", "/usr", "/usr", - "--ro-bind", "/lib", "/lib", - "--ro-bind", "/lib64", "/lib64", -+ "@bubblewrap_bin@", -+ "--ro-bind", "@storeDir@", "@storeDir@", ++ "@bubblewrap_bin@", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", "--proc", "/proc", "--dev", "/dev", - "--symlink", "usr/bin", "/bin", From a3e440ca8b8acc940070a37c95ac670f66740fac Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sun, 24 Feb 2019 00:28:10 +0100 Subject: [PATCH 2/2] gnome-desktop: cherry-pick nautilus sandbox changes --- .../gnome-3/core/gnome-desktop/bubblewrap-paths.patch | 11 +++++------ 1 file 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++)