gnome3.gnome_settings_daemon: use wrapGAppsHook

This fixes the "Using the 'memory' GSettings backend." error if
gnome-settings-daemon is used separately from gnome.
This commit is contained in:
Gabriel Ebner 2017-04-09 10:00:12 +02:00
parent ec674a6372
commit 443dc395c5

View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit , libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager
, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: , docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
@ -14,15 +14,7 @@ stdenv.mkDerivation rec {
libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
libcanberra_gtk3 upower colord libgweather xkeyboard_config libcanberra_gtk3 upower colord libgweather xkeyboard_config
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ];
# FIXME: glib binaries shouldn't be in .dev!
preFixup = ''
wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix PATH : "${glib.dev}/bin" \
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;