public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ibus by using a python.buildEnv.

Browse Source
This commit is contained in:
Tom Hunger 2017-08-28 19:58:49 +01:00
parent 64e4b9637b
commit 6dc4b5229b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/inputmethods/ibus/default.nix
View File

@ -48,6 +48,9 @@ let
sha256 = "1a3qzsab7vzjqpdialp1g8ppr21x05v0ph8ngyq9pyjkx4vzcdi7"; sha256 = "1a3qzsab7vzjqpdialp1g8ppr21x05v0ph8ngyq9pyjkx4vzcdi7";
}; };
}; };
pyEnv = python3.buildEnv.override {
extraLibs = [ python3.pkgs.pygobject3 ];
};
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "ibus-${version}"; name = "ibus-${version}";
version = "1.5.16"; version = "1.5.16";
@ -77,16 +80,16 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
python3 pyEnv
intltool isocodes pkgconfig intltool isocodes pkgconfig
gtk2 gtk3 dconf gtk2 gtk3 dconf
json_glib json_glib
dbus libnotify gobjectIntrospection wayland dbus libnotify gobjectIntrospection wayland
]; ];
propagatedBuildInputs = [ glib python3.pkgs.pygobject3 ]; propagatedBuildInputs = [ glib ];
nativeBuildInputs = [ wrapGAppsHook python3.pkgs.wrapPython ]; nativeBuildInputs = [ wrapGAppsHook ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -104,11 +107,6 @@ in stdenv.mkDerivation rec {
substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo" substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"
''; '';
postFixup = ''
buildPythonPath $out
patchPythonScript $out/share/ibus/setup/main.py
'';
doInstallCheck = true; doInstallCheck = true;
installCheckPhase = "$out/bin/ibus version"; installCheckPhase = "$out/bin/ibus version";