From cb10990fdc2f1b671390a2f1b1b11b3362dd9f1d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 26 Feb 2016 17:31:14 -0600
Subject: [PATCH] ibus-anthy: upgrade to Python 3

---
 .../ibus-engines/ibus-anthy/default.nix            | 14 +++++++++-----
 pkgs/top-level/all-packages.nix                    |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 89039745fd99..2494c75a06c6 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitHub, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection,
-  python, pythonPackages, gtk3, libtool, automake, autoconf }:
+{ stdenv, fetchFromGitHub, makeWrapper, ibus, anthy, intltool
+, pkgconfig, glib, gobjectIntrospection
+, python3, pygobject3, gtk3, libtool, automake, autoconf
+}:
 
 stdenv.mkDerivation rec {
   name = "ibus-anthy-${version}";
@@ -18,12 +20,14 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t";
 
-  buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection
-    python pythonPackages.pygobject3 gtk3 libtool automake autoconf ];
+  buildInputs = [
+    makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection
+    python3 pygobject3 gtk3 libtool automake autoconf
+  ];
 
   postFixup = ''
     substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
-    for file in "$out"/libexec/*; do
+    for file in "$out"/libexec/*; do # */
       wrapProgram "$file" \
         --prefix PYTHONPATH : $PYTHONPATH \
         --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH:$out/lib/girepository-1.0
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 657d82db3f41..3babc7e424db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1171,7 +1171,9 @@ let
 
   ibus-engines = {
 
-    anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
+    anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy {
+      inherit (python3Packages) pygobject3;
+    };
 
     hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul {
       inherit (python3Packages) pygobject3;