gnome3.nautilus: fix thumbnail generation

3.30 copied over the thumbnail code frome gnome-desktop:
673c81cf9f

Simply patch nautilus too.

ref https://github.com/NixOS/nixpkgs/issues/50494
This commit is contained in:
Tor Hedin Brønner 2018-12-13 09:13:18 +01:00
parent 2232135cf9
commit 4d0a88b21a
2 changed files with 40 additions and 6 deletions

View File

@ -0,0 +1,19 @@
--- 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,
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", "@storeDir@", "@storeDir@",
"--proc", "/proc",
"--dev", "/dev",
- "--symlink", "usr/bin", "/bin",
- "--symlink", "usr/sbin", "/sbin",
"--chdir", "/",
"--setenv", "GIO_USE_VFS", "local",
"--unshare-all",

View File

@ -1,6 +1,9 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, python3, wrapGAppsHook { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
, gtk, gnome3, gnome-autoar, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , desktop-file-utils, python3, wrapGAppsHook , gtk, gnome3, gnome-autoar
, exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }: , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
, substituteAll, bubblewrap
}:
let let
pname = "nautilus"; pname = "nautilus";
@ -13,11 +16,14 @@ in stdenv.mkDerivation rec {
sha256 = "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv"; sha256 = "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv";
}; };
nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils ]; nativeBuildInputs = [
meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook
desktop-file-utils
];
buildInputs = [ buildInputs = [
glib-networking shared-mime-info libexif gtk exempi libnotify libselinux glib-networking shared-mime-info libexif gtk exempi libnotify libselinux
tracker tracker-miners gnome-desktop gexiv2 libseccomp tracker tracker-miners gexiv2 libseccomp bubblewrap
gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
]; ];
@ -36,7 +42,16 @@ in stdenv.mkDerivation rec {
patchShebangs build-aux/meson/postinstall.py patchShebangs build-aux/meson/postinstall.py
''; '';
patches = [ ./extension_dir.patch ]; patches = [
./extension_dir.patch
# 3.30 now generates it's own thummbnails,
# and no longer depends on `gnome-desktop`
(substituteAll {
src = ./bubblewrap-paths.patch;
bubblewrap_bin = "${bubblewrap}/bin/bwrap";
inherit (builtins) storeDir;
})
];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {