mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 21:33:03 +03:00
gnome3.gnome_settings_daemon: depend on ibus
This commit is contained in:
parent
8b3c8926eb
commit
96777994c8
@ -1,7 +1,7 @@
|
|||||||
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
|
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
|
||||||
, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
|
, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
|
||||||
, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool
|
, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool
|
||||||
, docbook_xsl, docbook_xsl_ns, makeWrapper }:
|
, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gnome-settings-daemon-3.10.2";
|
name = "gnome-settings-daemon-3.10.2";
|
||||||
@ -11,13 +11,11 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240";
|
sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = "--disable-ibus";
|
|
||||||
|
|
||||||
# fatal error: gio/gunixfdlist.h: No such file or directory
|
# fatal error: gio/gunixfdlist.h: No such file or directory
|
||||||
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
|
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
|
||||||
|
|
||||||
buildInputs = with gnome3;
|
buildInputs = with gnome3;
|
||||||
[ intltool pkgconfig gtk glib gsettings_desktop_schemas libnotify gnome_desktop
|
[ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas libnotify gnome_desktop
|
||||||
lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather
|
lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather
|
||||||
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
|
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
|
||||||
libtool docbook_xsl docbook_xsl_ns makeWrapper ];
|
libtool docbook_xsl docbook_xsl_ns makeWrapper ];
|
||||||
@ -25,6 +23,7 @@ stdenv.mkDerivation rec {
|
|||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
|
wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
|
||||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||||
|
--prefix PATH : "${glib}/bin" \
|
||||||
--prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
|
--prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user