NixOS · Aug 25, 2018 · Aug 25, 2018 · Aug 25, 2018 · Aug 25, 2018 · Aug 25, 2018
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python2Packages, intltool, file
-, wrapGAppsHook, gtkvnc, vte, avahi, dconf
+, wrapGAppsHook, gtk-vnc, vte, avahi, dconf
 , gobjectIntrospection, libvirt-glib, system-libvirt
 , gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
 , spiceSupport ? true, spice-gtk ? null
@@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec {
   ];
 
   buildInputs =
-    [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi
+    [ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi
       gsettings-desktop-schemas libosinfo gtk3
     ] ++ optional spiceSupport spice-gtk;
 

diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
+{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp
 , libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen
-, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
+, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl
 , libapparmor, gst_all_1
 , spiceSupport ? true
 , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
     sha256 = "00y9vi69sja4pkrfnvrkwsscm41bqrjzvp8aijb20pvg6ymczhj7";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
   buildInputs = [
-    glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info
-    libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib
+    glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info
+    libvirt yajl gsettings-desktop-schemas libvirt-glib
     libcap_ng numactl libapparmor
   ] ++ optionals stdenv.isx86_64 [
     xen
@@ -33,14 +33,6 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
   ];
 
-  postInstall = ''
-    for f in "$out"/bin/*; do
-        wrapProgram "$f" \
-          --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-          --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
-    done
-  '';
-
   meta = {
     description = "A viewer for remote virtual machines";
     maintainers = [ maintainers.raskin ];

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib
-, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk
+, glib, gobjectIntrospection, libxml2, gtk3, gtk-vnc, libvirt, spice-gtk
 , spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
 , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
 , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ spice-gtk ];
 
   buildInputs = [
-    libvirt-glib glib gtk3 gtkvnc libxml2
+    libvirt-glib glib gtk3 gtk-vnc libxml2
     libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
     tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
     gnome3.defaultIconTheme librsvg acl libgudev libsecret

diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -2,25 +2,25 @@
 , pkgconfig, gtk3, glib, tracker, tracker-miners
 , itstool, libxslt, webkitgtk, libgdata
 , gnome-desktop, libzapojit, libgepub
-, gnome3, gdk_pixbuf, libsoup, docbook_xsl
+, gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
 , gobjectIntrospection, inkscape, poppler_utils
 , desktop-file-utils, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "gnome-documents-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1i0s246bg9xcjxgbajph744pn65bq5gk6r9kkl3f5iwdq3rjc0pm";
+    sha256 = "0aannnq39gjg6jnjm4kr8fqigg5npjvd8dyxw7k4hy4ny0ffxwjq";
   };
 
   doCheck = true;
 
   mesonFlags = [ "-Dgetting-started=true" ];
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook
+    meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook
     inkscape poppler_utils # building getting started
   ];
   buildInputs = [

diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool
-, libsecret, itstool, makeWrapper, librsvg }:
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool
+, libsecret, itstool, wrapGAppsHook, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "vinagre-${version}";
@@ -10,25 +10,25 @@ stdenv.mkDerivation rec {
     sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "vinagre"; attrPath = "gnome3.vinagre"; };
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret
-                  itstool makeWrapper gnome3.defaultIconTheme librsvg ];
+  nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
+  buildInputs = [
+    gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg
+  ];
 
   NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
 
-  preFixup = ''
-    wrapProgram "$out/bin/vinagre" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
-  '';
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "vinagre";
+      attrPath = "gnome3.vinagre";
+    };
+  };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Vinagre;
     description = "Remote desktop viewer for GNOME";
-    platforms = platforms.linux;
+    homepage = https://wiki.gnome.org/Apps/Vinagre;
+    license = licenses.gpl2Plus;
     maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix
@@ -1,11 +1,11 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2
+{ fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2
 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook
 , wrapGAppsHook }:
 
 let
   pname = "caribou";
   version = "0.4.21";
-  pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
+  pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] );
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -14,11 +14,21 @@ in stdenv.mkDerivation rec {
     sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww";
   };
 
+  patches = [
+    # Fix crash in GNOME Flashback
+    # https://bugzilla.gnome.org/show_bug.cgi?id=791001
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=364774;
+      sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ];
 
-  buildInputs = with gnome3;
-    [ glib gtk clutter at-spi2-core dbus pythonEnv python3Packages.pygobject3
-      libXtst gtk2 ];
+  buildInputs = [
+    glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3
+    libXtst gtk2
+  ];
 
   propagatedBuildInputs = [ gnome3.libgee libxklavier ];
 
@@ -37,9 +47,8 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "An input assistive technology intended for switch and pointer users";
     homepage = https://wiki.gnome.org/Projects/Caribou;
-    platforms = platforms.linux;
     license = licenses.lgpl21;
     maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
-
 }
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -1,28 +1,47 @@
 { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib
-, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection }:
+, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-bluetooth-${version}";
-  version = "3.28.1";
+let
+  pname = "gnome-bluetooth";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "3.28.2";
+
+  # TODO: split out "lib"
+  outputs = [ "out" "dev" "devdoc" "man" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1g3yrq5792qvc5rxnf26cgciawrca27hqn6wxfcf63bpa2dsjcsn";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    sha256 = "0ch7lll5n8v7m26y6y485gnrik19ml42rsh1drgcxydm6fn62j8z";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-bluetooth"; attrPath = "gnome3.gnome-bluetooth"; };
-  };
+  nativeBuildInputs = [
+    meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection
+    gtk-doc docbook_xsl docbook_xml_dtd_43
+  ];
+  buildInputs = [
+    glib gtk3 udev libnotify libcanberra-gtk3
+    gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas
+  ];
 
-  nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ];
-  buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3
-                  gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas ];
+  mesonFlags = [
+    "-Dicon_update=false"
+    "-Dgtk_doc=true"
+  ];
 
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file
     patchShebangs meson_post_install.py
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
     description = "Application that let you manage Bluetooth in the GNOME destkop";

diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -1,32 +1,32 @@
-{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, makeWrapper
+{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt
 , meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server
 , exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif
-, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid
+, libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid
 , libvorbis, libxml2, poppler, taglib, upower }:
 
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+let
   pname = "tracker-miners";
-  version = "2.0.5";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "00k8nb8dbkjnqjk12gcs5n2cm6yny553qildsm5b2c8nfs1w16b4";
+    sha256 = "107638773mihxdi194wf3saacqrr4cp9xn3qjfmx60bwq5451ma0";
   };
 
   nativeBuildInputs = [
     intltool
     itstool
     libxslt
-    makeWrapper
     meson
     ninja
     pkgconfig
     vala
     wrapGAppsHook
   ];
 
-  # TODO: add libgrss, libenca, libosinfo
+  # TODO: add libenca, libosinfo
   buildInputs = [
     bzip2
     dbus
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
     json-glib
     libcue
     libexif
+    libgrss
     libgsf
     libiptcdata
     libjpeg
@@ -60,7 +61,8 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dminer_rss=false" # needs libgrss
+    # TODO: tests do not like our sandbox
+    "-Dfunctional_tests=false"
   ];
 
   patches = [
@@ -75,13 +77,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  passthru = {
-    updateScript = gnome3.updateScript {
-      packageName = pname;
-      attrPath = "gnome3.${pname}";
-    };
-  };
-
+  # Symlinks require absolute path and we still cannot use placeholders
   # https://github.com/NixOS/nixpkgs/pull/39534#discussion_r184339131
   # https://github.com/NixOS/nixpkgs/pull/37693
   preConfigure = ''
@@ -92,10 +88,13 @@ stdenv.mkDerivation rec {
     ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
-  # https://bugzilla.gnome.org/show_bug.cgi?id=796145
-  postFixup = ''
-    rm $out/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service
-  '';
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+      versionPolicy = "none";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/Tracker;

diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
@@ -1,3 +1,25 @@
+--- a/meson.build
++++ b/meson.build
+@@ -37,15 +37,15 @@
+   #
+   # This check acts as a guard to make sure we are being configured with the
+   # right prefix, among other things.
+-  tracker_store = find_program(join_paths(get_option('prefix'), get_option('libexecdir'), 'tracker-store'))
++  tracker_store = find_program(join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'libexec', 'tracker-store'))
+   tracker_store_path = tracker_store.path()
+
+   # If we are building against an installed version of tracker core rather than
+   # having it as a subproject, these 'uninstalled' locations point to the actual
+   # installed locations.
+-  tracker_uninstalled_domain_rule = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'domain-ontologies', 'default.rule')
+-  tracker_uninstalled_nepomuk_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'ontologies', 'nepomuk')
+-  tracker_uninstalled_stop_words_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'stop-words', 'default.rule')
++  tracker_uninstalled_domain_rule = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'domain-ontologies', 'default.rule')
++  tracker_uninstalled_nepomuk_ontologies_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'ontologies', 'nepomuk')
++  tracker_uninstalled_stop_words_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'stop-words', 'default.rule')
+ endif
+
+ avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
 --- a/src/libtracker-miners-common/tracker-domain-ontology.c
 +++ b/src/libtracker-miners-common/tracker-domain-ontology.c
 @@ -313,7 +313,7 @@
@@ -9,7 +31,7 @@
  		                         DEFAULT_RULE, NULL);
 
  		if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
-@@ -372,7 +372,7 @@
+@@ -378,7 +378,7 @@
  	if (!priv->ontology_location) {
  		gchar *ontology_path;