From 7021b07a8d725220d76585562cc55a6d56670b91 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 26 Aug 2013 17:04:42 +0300
Subject: [PATCH] Move the compose-cache code from kde4 to xsession since it is
 supposedly useful for all X-based stuff.

---
 modules/services/x11/desktop-managers/kde4.nix    | 5 -----
 modules/services/x11/display-managers/default.nix | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 6d804c13827d..cf86d2b86be5 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -97,11 +97,6 @@ in
             # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
             rm -fv $HOME/.kde/cache-*/icon-cache.kcache
 
-            # Speed up application start by 50-150ms according to
-            # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html
-            rm -fv $HOME/.compose-cache
-            mkdir $HOME/.compose-cache
-
             # Qt writes a weird ‘libraryPath’ line to
             # ~/.config/Trolltech.conf that causes the KDE plugin
             # paths of previous KDE invocations to be searched.
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 451355d4980d..b6f6f2ec32eb 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -94,6 +94,11 @@ let
 
       export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri
 
+      # Speed up application start by 50-150ms according to
+      # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html
+      rm -fv $HOME/.compose-cache
+      mkdir $HOME/.compose-cache
+
       ${cfg.displayManager.sessionCommands}
 
       # Allow the user to setup a custom session type.