diff options
| author | Alexander Ried <ried@mytum.de> | 2016-10-02 19:00:23 +0200 |
|---|---|---|
| committer | Alexander Ried <ried@mytum.de> | 2016-10-15 20:32:14 +0200 |
| commit | 5125161a77a56b8524c24f63d70788f06038cf71 (patch) | |
| tree | 3bd9727e9310f0f1dd1b4bc4875643de607b2732 | |
| parent | 3acee13364ebb9bbfeff0478cc4a754955210790 (diff) | |
| download | nixlib-5125161a77a56b8524c24f63d70788f06038cf71.tar nixlib-5125161a77a56b8524c24f63d70788f06038cf71.tar.gz nixlib-5125161a77a56b8524c24f63d70788f06038cf71.tar.bz2 nixlib-5125161a77a56b8524c24f63d70788f06038cf71.tar.lz nixlib-5125161a77a56b8524c24f63d70788f06038cf71.tar.xz nixlib-5125161a77a56b8524c24f63d70788f06038cf71.tar.zst nixlib-5125161a77a56b8524c24f63d70788f06038cf71.zip | |
gnome3_22.gnome-session: lookup of gnome-settings-daemon.desktop
3 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 9d1a62df3496..77e0d9cb06de 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -97,7 +97,6 @@ in environment = { GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}"; GDM_SESSIONS_DIR = "${cfg.session.desktops}"; - XDG_CONFIG_DIRS = "${gnome3.gnome_settings_daemon}/etc/xdg"; # Find the mouse XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons"; }; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix index 2e94f5d8581e..135e833e9b46 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome3.gnome_shell}/share" + --suffix XDG_DATA_DIRS : "${gnome3.gnome_shell}/share" \ + --suffix XDG_CONFIG_DIRS : "${gnome3.gnome_settings_daemon}/etc/xdg" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix index 2f51773049d5..00999353c2fb 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix PATH : "${glib.dev}/bin" \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - mkdir -p "$out/share/gnome/autostart" - cp "$out/etc/xdg/autostart/gnome-settings-daemon.desktop" "$out/share/gnome/autostart" ''; meta = with stdenv.lib; { |