about summary refs log tree commit diff
path: root/nixos/modules/services/x11
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2017-11-15 03:38:20 +0100
committerJan Tojnar <jtojnar@gmail.com>2017-11-15 03:45:25 +0100
commit510737cca7ef7a15c1b570150bbae71929be6e01 (patch)
treeb9acde6566e09afcf7f387cbccbaf68f5fd86a16 /nixos/modules/services/x11
parent1f79b943c0543b8044441cf41a25ea54ed49d6cc (diff)
downloadnixlib-510737cca7ef7a15c1b570150bbae71929be6e01.tar
nixlib-510737cca7ef7a15c1b570150bbae71929be6e01.tar.gz
nixlib-510737cca7ef7a15c1b570150bbae71929be6e01.tar.bz2
nixlib-510737cca7ef7a15c1b570150bbae71929be6e01.tar.lz
nixlib-510737cca7ef7a15c1b570150bbae71929be6e01.tar.xz
nixlib-510737cca7ef7a15c1b570150bbae71929be6e01.tar.zst
nixlib-510737cca7ef7a15c1b570150bbae71929be6e01.zip
nixos/gnome3: override schemas using env variable
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overriden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).

To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
Diffstat (limited to 'nixos/modules/services/x11')
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index ecf0abb1efd2..cbb06b471093 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -150,7 +150,7 @@ in {
           export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
 
           # Override gsettings-desktop-schema
-          export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
+          export NIX_GSETTINGS_OVERRIDES_DIR=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
 
           # Let nautilus find extensions
           export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/