diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-02-25 13:33:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 13:33:47 +0100 |
| commit | c3694e1f3a603623fa51680b673b452fc63a914b (patch) | |
| tree | 4e37f71d9a411ef231b75adfb93d9809c0db0da3 | |
| parent | 3a83ec23dc9be63982c687cead27842ae4d77c94 (diff) | |
| parent | a3e440ca8b8acc940070a37c95ac670f66740fac (diff) | |
| download | nixlib-c3694e1f3a603623fa51680b673b452fc63a914b.tar nixlib-c3694e1f3a603623fa51680b673b452fc63a914b.tar.gz nixlib-c3694e1f3a603623fa51680b673b452fc63a914b.tar.bz2 nixlib-c3694e1f3a603623fa51680b673b452fc63a914b.tar.lz nixlib-c3694e1f3a603623fa51680b673b452fc63a914b.tar.xz nixlib-c3694e1f3a603623fa51680b673b452fc63a914b.tar.zst nixlib-c3694e1f3a603623fa51680b673b452fc63a914b.zip | |
Merge pull request #56188 from layus/poc-fix-nautilus-thumbnails
Fix thumbnails generation in nautilus
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch | 11 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch | 7 |
2 files changed, 9 insertions, 9 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++) 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", |