From d6a6f9eb95a778b3267c180d959984bdb1763f19 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 25 Aug 2018 13:42:17 +0200
Subject: [PATCH] gnome3.caribou: fix on GNOME Flashback

---
 .../desktops/gnome-3/core/caribou/default.nix | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix
index 48be01faf33..acfd6dfb374 100644
--- 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;
   };
-
 }