diff options
author | Tom Hunger <tehunger@gmail.com> | 2017-08-28 19:58:49 +0100 |
---|---|---|
committer | Tom Hunger <tehunger@gmail.com> | 2017-08-28 20:01:07 +0100 |
commit | 6dc4b5229bd85156169be39be376bb85a5fccd0f (patch) | |
tree | 6571ccf7647e6f03900792802f9cccfa5050f468 /pkgs/tools/inputmethods/ibus/default.nix | |
parent | 64e4b9637bdb2d616a696f6b7af545dae963e471 (diff) | |
download | nixlib-6dc4b5229bd85156169be39be376bb85a5fccd0f.tar nixlib-6dc4b5229bd85156169be39be376bb85a5fccd0f.tar.gz nixlib-6dc4b5229bd85156169be39be376bb85a5fccd0f.tar.bz2 nixlib-6dc4b5229bd85156169be39be376bb85a5fccd0f.tar.lz nixlib-6dc4b5229bd85156169be39be376bb85a5fccd0f.tar.xz nixlib-6dc4b5229bd85156169be39be376bb85a5fccd0f.tar.zst nixlib-6dc4b5229bd85156169be39be376bb85a5fccd0f.zip |
Fix ibus by using a python.buildEnv.
Diffstat (limited to 'pkgs/tools/inputmethods/ibus/default.nix')
-rw-r--r-- | pkgs/tools/inputmethods/ibus/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index d392777dfd44..66d61b8c5e9d 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -48,6 +48,9 @@ let sha256 = "1a3qzsab7vzjqpdialp1g8ppr21x05v0ph8ngyq9pyjkx4vzcdi7"; }; }; + pyEnv = python3.buildEnv.override { + extraLibs = [ python3.pkgs.pygobject3 ]; + }; in stdenv.mkDerivation rec { name = "ibus-${version}"; version = "1.5.16"; @@ -77,16 +80,16 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - python3 + pyEnv intltool isocodes pkgconfig gtk2 gtk3 dconf json_glib dbus libnotify gobjectIntrospection wayland ]; - propagatedBuildInputs = [ glib python3.pkgs.pygobject3 ]; + propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ wrapGAppsHook python3.pkgs.wrapPython ]; + nativeBuildInputs = [ wrapGAppsHook ]; outputs = [ "out" "dev" ]; @@ -104,11 +107,6 @@ in stdenv.mkDerivation rec { substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo" ''; - postFixup = '' - buildPythonPath $out - patchPythonScript $out/share/ibus/setup/main.py - ''; - doInstallCheck = true; installCheckPhase = "$out/bin/ibus version"; |