From 69384eb47f20d4d9357ad67f4583d3aa331da491 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Jun 2018 04:50:30 +0200
Subject: [PATCH] =?UTF-8?q?gnome3.totem:=203.26.0=20=E2=86=92=203.26.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/totem/default.nix | 21 ++++----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index f852e053cdeb..df37377e52e8 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -6,34 +6,25 @@
 
 stdenv.mkDerivation rec {
   name = "totem-${version}";
-  version = "3.26.0";
+  version = "3.26.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13";
+    sha256 = "10n302fdp3lhkzbij5sbzmsnln738029xil6cnng2d4dxv4n1099";
   };
 
   doCheck = true;
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobjectIntrospection wrapGAppsHook ];
   buildInputs = [
     gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
     gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
     gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info
     gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop
     gnome3.gsettings-desktop-schemas tracker nautilus
-  ];
-
-  propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
-
-  patches = [
-    (fetchurl {
-      name = "remove-pycompile.patch";
-      url = "https://bug787965.bugzilla-attachments.gnome.org/attachment.cgi?id=360204";
-      sha256 = "1iphlazllv42k553jqh3nqrrh5jb63gy3nhj4ipwc9xh4sg2irhi";
-    })
+    python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
   ];
 
   postPatch = ''
@@ -43,10 +34,6 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dwith-nautilusdir=lib/nautilus/extensions-3.0"
-    # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
-    # https://bugzilla.gnome.org/show_bug.cgi?id=784236
-    # https://github.com/mesonbuild/meson/issues/1994
-    "-Denable-vala=no"
   ];
 
   wrapPrefixVariables = [ "PYTHONPATH" ];