From bb13afea6cff95c5d4d6f7a7045d60f141bb7abf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Mar 2016 16:39:07 -0400
Subject: [PATCH] pyatspi: call via pythonPackages

---
 pkgs/development/python-modules/pyatspi/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix                     | 2 +-
 pkgs/top-level/python-packages.nix                  | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index 636126ea74a..598056a0c36 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python3, python3Packages, at_spi2_core }:
+{ stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }:
 
 stdenv.mkDerivation rec {
   version = "2.18.0";
@@ -9,8 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "0imbyk2v6c11da7pkwz91313pkkldxs8zfg81zb2ql6h0nnh6vzq";
   };
 
+  broken = true;
+
   buildInputs = [
-    pkgconfig python3 python3Packages.pygobject3 at_spi2_core
+    at_spi2_core
+    pkgconfig
+    pythonPackages.python
+    pythonPackages.pygobject3
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0906c7ce961..85e3c5f7b6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2944,7 +2944,7 @@ in
 
   pwnat = callPackage ../tools/networking/pwnat { };
 
-  pyatspi = callPackage ../development/python-modules/pyatspi { };
+  pyatspi = python3Packages.pyatspi;
 
   pycangjie = pythonPackages.pycangjie;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0c2bc5d351..0a2e6bc7286 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -140,6 +140,8 @@ in modules // {
 
   plantuml = callPackage ../tools/misc/plantuml { };
 
+  pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}";
+
   pycairo = callPackage ../development/python-modules/pycairo {
   };