From ca27392d9cf1361874e4ff58437f8b84e151735a Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Thu, 4 Jan 2018 14:04:57 -0200 Subject: mate-control-center: add gsettings schemas path to XDG vars mate-control-center depends on mate-settings-daemon, but the later needs gsettings schemas provided by the former. To fix this the gsettings schema path from mate-control-center is added to XDG_DATA_DIRS at session startup. --- nixos/modules/services/x11/desktop-managers/mate.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'nixos/modules/services/x11/desktop-managers') diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index ffb2e123538b..dc6658771e42 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -12,6 +12,17 @@ let in filter (x: !(builtins.elem (pkgName x) ysNames)) xs; + addToXDGDirs = p: '' + if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} + fi + + if [ -d "${p}/lib/girepository-1.0" ]; then + export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib + fi + ''; + xcfg = config.services.xserver; cfg = xcfg.desktopManager.mate; @@ -56,6 +67,9 @@ in # Find the mouse export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons + # Add mate-control-center paths to some XDG variables because its schemas are needed by mate-settings-daemon, and mate-settings-daemon is a dependency for mate-control-center (that is, they are mutually recursive) + ${addToXDGDirs pkgs.mate.mate-control-center} + # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update -- cgit 1.4.1