about summary refs log tree commit diff
path: root/nixos/modules/services/x11
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-11-29 10:00:30 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-11-29 10:02:40 +0100
commit5f020d5627789ce77b2997e360ece984c261bce7 (patch)
treead2398b7aadcb52e5ef02df8dd961874edb7c816 /nixos/modules/services/x11
parent0e6ca9e85d76ddb2757d05119f07f4b2fe32b689 (diff)
parent8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5 (diff)
downloadnixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar
nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.gz
nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.bz2
nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.lz
nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.xz
nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.zst
nixlib-5f020d5627789ce77b2997e360ece984c261bce7.zip
Merge branch 'staging'
There are security fixes in multiple packages /cc #32117,
so I'm merging a little earlier, with a few thousand jobs
still not finished on Hydra for x86_64-darwin and aarch64-linux.
Diffstat (limited to 'nixos/modules/services/x11')
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index e5a79496c7a5..d2c856fc9332 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -108,6 +108,7 @@ in {
     services.gnome3.seahorse.enable = mkDefault true;
     services.gnome3.sushi.enable = mkDefault true;
     services.gnome3.tracker.enable = mkDefault true;
+    services.gnome3.tracker-miners.enable = mkDefault true;
     hardware.pulseaudio.enable = mkDefault true;
     services.telepathy.enable = mkDefault true;
     networking.networkmanager.enable = mkDefault true;
@@ -152,7 +153,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/