gnome3.nautilus: 3.32.3 → 3.34.0

* add gobject-introspection for gir

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
This commit is contained in:
Tor Hedin Brønner 2019-09-02 16:45:54 +00:00
parent f01d9db504
commit f011fc9c78
2 changed files with 60 additions and 38 deletions

View file

@ -1,15 +0,0 @@
--- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
+++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
@@ -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",
+ "@bubblewrap_bin@",
+ "--ro-bind", "@storeDir@", "@storeDir@",
+ "--ro-bind", "/run/current-system", "/run/current-system",
NULL);
/* These directories might be symlinks into /usr/... */

View file

@ -1,33 +1,77 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk-pixbuf
, substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas
{ stdenv
, fetchurl
, meson
, ninja
, pkgconfig
, gettext
, libxml2
, desktop-file-utils
, python3
, wrapGAppsHook
, gtk3
, gnome3
, gnome-autoar
, glib-networking
, shared-mime-info
, libnotify
, libexif
, libseccomp
, exempi
, librsvg
, tracker
, tracker-miners
, gexiv2
, libselinux
, gdk-pixbuf
, substituteAll
, gnome-desktop
, gst_all_1
, gsettings-desktop-schemas
, gobject-introspection
}:
let
stdenv.mkDerivation rec {
pname = "nautilus";
version = "3.32.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1x9crzbj6rrrf8w5dkcx0c14j40byr4ijpzkwd5dcrbfvvdy1r01";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ncs5hmaxjb9p2yzj81m7dz2x27vzmvppir3058dk236jzn98r36";
};
nativeBuildInputs = [
meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook
desktop-file-utils
gettext
gobject-introspection
libxml2
meson
ninja
pkgconfig
python3
wrapGAppsHook
];
buildInputs = [
glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux
tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base
gnome3.adwaita-icon-theme gsettings-desktop-schemas
exempi
gexiv2
glib-networking
gnome-desktop
gnome3.adwaita-icon-theme
gsettings-desktop-schemas
gst_all_1.gst-plugins-base
gtk3
libexif
libnotify
libseccomp
libselinux
shared-mime-info
tracker
tracker-miners
];
propagatedBuildInputs = [ gnome-autoar ];
propagatedBuildInputs = [
gnome-autoar
];
preFixup = ''
gappsWrapperArgs+=(
@ -44,13 +88,6 @@ in stdenv.mkDerivation rec {
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 = {