From 41204574bed6a304e41ad61f18338d83df2cdd2f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 28 Feb 2016 07:10:11 -0600 Subject: [PATCH] ibus-m17n: use Python 3 --- .../ibus-engines/ibus-m17n/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-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index c6c43d05898..81bfffb2546 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub, ibus, m17n_lib, m17n_db, automake, autoconf, - gettext, libtool, pkgconfig, python, pythonPackages }: +{ stdenv, fetchFromGitHub +, automake, autoconf, libtool, pkgconfig +, ibus, m17n_lib, m17n_db, gettext, python3, pygobject3 +}: stdenv.mkDerivation rec { name = "ibus-m17n-${version}"; @@ -12,11 +14,13 @@ stdenv.mkDerivation rec { sha256 = "1n0bvgc4jyksgvzrw5zs2pxcpxcn3gcc0j2kasbznm34fpv3frsr"; }; - buildInputs = [ - ibus m17n_lib m17n_db automake autoconf gettext - libtool pkgconfig python pythonPackages.pygobject3 + buildInputs = [ + ibus m17n_lib m17n_db gettext + python3 pygobject3 ]; + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + preConfigure = '' autoreconf --verbose --force --install ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75565c0f5e0..ef6dc1f6f3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1180,7 +1180,9 @@ let inherit (python3Packages) pygobject3; }; - m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; + m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { + inherit (python3Packages) pygobject3; + }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { inherit (pythonPackages) gyp;