Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnome3.nautilus: fix thumbnail generation #51933

Merged
merged 1 commit into from
Dec 13, 2018
Merged

gnome3.nautilus: fix thumbnail generation #51933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
27 changes: 21 additions & 6 deletions pkgs/desktops/gnome-3/core/nautilus/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, python3, wrapGAppsHook
, gtk, gnome3, gnome-autoar, glib-networking, shared-mime-info, libnotify, libexif, libseccomp
, exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }:
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
, desktop-file-utils, python3, wrapGAppsHook , gtk, gnome3, gnome-autoar
, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
, substituteAll, bubblewrap
}:

let
pname = "nautilus";
Expand All @@ -13,11 +16,14 @@ in stdenv.mkDerivation rec {
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 = [
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
];

Expand All @@ -36,7 +42,16 @@ in stdenv.mkDerivation rec {
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 = {
updateScript = gnome3.updateScript {
Expand Down