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

ibus: wrap with GTK dependencies

Browse Source 
Without this ibus can't load its settings.
Also don't propagate PYTHONPATH.
This commit is contained in:
Nikolay Amiantov 2017-03-25 23:53:01 +03:00
parent 8c4339a9dc
commit 99434abff7
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper { stdenv, fetchurl, wrapGAppsHook
, intltool, isocodes, pkgconfig , intltool, isocodes, pkgconfig
, python3, pygobject3 , python3
, gtk2, gtk3, atk, dconf, glib, json_glib , gtk2, gtk3, atk, dconf, glib, json_glib
, dbus, libnotify, gobjectIntrospection, wayland , dbus, libnotify, gobjectIntrospection, wayland
, nodePackages , nodePackages
@ -34,19 +34,21 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
python3 pygobject3 python3
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 ]; propagatedBuildInputs = [ glib python3.pkgs.pygobject3 ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ wrapGAppsHook python3.pkgs.wrapPython ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
enableParallelBuilding = true;
preConfigure = '' preConfigure = ''
# Fix hard-coded installation paths, so make does not try to overwrite our # Fix hard-coded installation paths, so make does not try to overwrite our
# Python installation. # Python installation.
@ -59,14 +61,9 @@ stdenv.mkDerivation rec {
substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo" substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"
''; '';
preFixup = '' postFixup = ''
for f in "$out/bin"/*; do #*/ buildPythonPath $out
wrapProgram "$f" \ patchPythonScript $out/share/ibus/setup/main.py
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
done
''; '';
doInstallCheck = true; doInstallCheck = true;

1
pkgs/top-level/all-packages.nix
View File

@ -1266,7 +1266,6 @@ with pkgs;
m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
ibus = callPackage ../tools/inputmethods/ibus { ibus = callPackage ../tools/inputmethods/ibus {
inherit (python3Packages) pygobject3;
inherit (gnome3) dconf glib; inherit (gnome3) dconf glib;
}; };