nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 12:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56188 from layus/poc-fix-nautilus-thumbnails

Browse Source 
Fix thumbnails generation in nautilus
This commit is contained in:
Tor Hedin Brønner 2019-02-25 13:33:47 +01:00 committed by GitHub
commit c3694e1f3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
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++)

7
pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
View File

@ -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",