From 8a61d3699f2d6b9b62fb0c0c5aab2545add27ca7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 11:58:38 +0100
Subject: [PATCH] python pycangjie: call package from python-packages.nix

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

diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
index 68a56dedc3a..8001f0b43a9 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie
-, sqlite, python3, cython3
+, sqlite, python, cython
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    autoconf automake libtool pkgconfig libcangjie sqlite python3 cython3
+    autoconf automake libtool pkgconfig libcangjie sqlite python cython
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e556c73ea8..7181bb65e72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2810,7 +2810,7 @@ let
 
   pyatspi = callPackage ../development/python-modules/pyatspi { };
 
-  pycangjie = callPackage ../development/python-modules/pycangjie { };
+  pycangjie = pythonPackages.pycangjie;
 
   pydb = callPackage ../development/tools/pydb { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 68483466dc1..0f84285c5f0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -140,6 +140,8 @@ in modules // {
   pycairo = callPackage ../development/python-modules/pycairo {
   };
 
+  pycangjie = if isPy3k then callPackage ../development/python-modules/pycangjie { } else throw "pycangjie not supported for interpreter ${python.executable}";
+
   pycrypto = callPackage ../development/python-modules/pycrypto { };
 
   pygame = callPackage ../development/python-modules/pygame { };