From 00d379a87346ab8e9093aefafea6be586068a730 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 13 Dec 2017 05:49:16 +0100
Subject: [PATCH 1/4] =?UTF-8?q?gnome3.gtksourceview:=203.24.5=20=E2=86=92?=
 =?UTF-8?q?=203.24.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gtksourceview/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix
index a8cdf8906d45..ec7a8a6aaa57 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gtksourceview-3.24.5";
+  name = "gtksourceview-3.24.6";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.5.tar.xz;
-    sha256 = "0246185fcc20c4734d01419a83f58f251a82e2a902fe60bb0335187fcf658181";
+    url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.tar.xz;
+    sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188";
   };
 }

From c2de94d7f321017dccf877f58f9c77c0cd544b04 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 13 Dec 2017 06:31:28 +0100
Subject: [PATCH 2/4] gnome3.gtksourceview: clean up

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

diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
index a39464449485..642f687a5c70 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
-, libxml2Python, perl, intltool, gettext, gnome3 }:
+, libxml2, perl, intltool, gettext, gnome3 }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   propagatedBuildInputs = [ gtk3 ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ atk cairo glib pango
-                  libxml2Python perl intltool gettext ];
+  nativeBuildInputs = [ pkgconfig intltool gettext perl ];
+  buildInputs = [ atk cairo glib pango libxml2 ];
 
   preBuild = ''
     substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"

From 5f94da02857861966ffc085af3428c7747835917 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 13 Dec 2017 07:06:21 +0100
Subject: [PATCH 3/4] gnome3.gtksourceview: enable tests

---
 .../gnome-3/core/gtksourceview/default.nix    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
index 642f687a5c70..7d3d43f5af0a 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
@@ -1,13 +1,20 @@
 { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
-, libxml2, perl, intltool, gettext, gnome3 }:
+, libxml2, perl, intltool, gettext, gnome3, dbus, xvfb_run, shared_mime_info }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  propagatedBuildInputs = [ gtk3 ];
+  propagatedBuildInputs = [
+    # Required by gtksourceview-3.0.pc
+    gtk3
+    # Used by gtk_source_language_manager_guess_language
+    shared_mime_info
+  ];
 
-  nativeBuildInputs = [ pkgconfig intltool gettext perl ];
+  nativeBuildInputs = [ pkgconfig intltool gettext perl ]
+    ++ stdenv.lib.optionals doCheck checkInputs;
   buildInputs = [ atk cairo glib pango libxml2 ];
+  checkInputs = [ xvfb_run dbus ];
 
   preBuild = ''
     substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
@@ -15,6 +22,14 @@ stdenv.mkDerivation rec {
 
   patches = [ ./nix_share_path.patch ];
 
+  doCheck = true;
+  checkPhase = ''
+    export NO_AT_BRIDGE=1
+    xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      make check
+  '';
+
   meta = with stdenv.lib; {
     platforms = with platforms; linux ++ darwin;
     maintainers = gnome3.maintainers;

From d075042ca318038d041b4b49ab4d5344212dd284 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 13 Dec 2017 07:43:55 +0100
Subject: [PATCH 4/4] gnome3.gtksourceview: split outputs

---
 pkgs/desktops/gnome-3/core/gtksourceview/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
index 7d3d43f5af0a..363cf1a0c4ac 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     shared_mime_info
   ];
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ pkgconfig intltool gettext perl ]
     ++ stdenv.lib.optionals doCheck checkInputs;
   buildInputs = [ atk cairo glib pango libxml2 ];