diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-02-26 17:31:14 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-02-26 18:08:48 -0600 |
| commit | cb10990fdc2f1b671390a2f1b1b11b3362dd9f1d (patch) | |
| tree | 4fed21ca3cb634bf73d824f6f4f69271a9d5d5ee /pkgs | |
| parent | f7f965baaa65c35858a9ab2e65b74dc1d6f2617a (diff) | |
| download | nixlib-cb10990fdc2f1b671390a2f1b1b11b3362dd9f1d.tar nixlib-cb10990fdc2f1b671390a2f1b1b11b3362dd9f1d.tar.gz nixlib-cb10990fdc2f1b671390a2f1b1b11b3362dd9f1d.tar.bz2 nixlib-cb10990fdc2f1b671390a2f1b1b11b3362dd9f1d.tar.lz nixlib-cb10990fdc2f1b671390a2f1b1b11b3362dd9f1d.tar.xz nixlib-cb10990fdc2f1b671390a2f1b1b11b3362dd9f1d.tar.zst nixlib-cb10990fdc2f1b671390a2f1b1b11b3362dd9f1d.zip | |
ibus-anthy: upgrade to Python 3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix | 14 | ||||
| -rw-r--r-- | 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; |