startkde: don't split script between NixOS module and package

2 files changed, 21 insertions, 21 deletions

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 125bce94aba7..2aa697e3abcc 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -75,27 +75,6 @@ in
       name = "kde5";
       bgSupport = true;
       start = ''
-        # The KDE icon cache is supposed to update itself
-        # automatically, but it uses the timestamp on the icon
-        # theme directory as a trigger.  Since in Nix the
-        # timestamp is always the same, this doesn't work.  So as
-        # a workaround, nuke the icon cache on login.  This isn't
-        # perfect, since it may require logging out after
-        # installing new applications to update the cache.
-        # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
-        rm -fv $HOME/.cache/icon-cache.kcache
-
-        # Qt writes a weird ‘libraryPath’ line to
-        # ~/.config/Trolltech.conf that causes the KDE plugin
-        # paths of previous KDE invocations to be searched.
-        # Obviously using mismatching KDE libraries is potentially
-        # disastrous, so here we nuke references to the Nix store
-        # in Trolltech.conf.  A better solution would be to stop
-        # Qt from doing this wackiness in the first place.
-        if [ -e $HOME/.config/Trolltech.conf ]; then
-            sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
-        fi
-
         exec ${plasma5.startkde}/bin/startkde;
       '';
     };
diff --git a/pkgs/desktops/plasma-5.1/startkde/startkde.in b/pkgs/desktops/plasma-5.1/startkde/startkde.in
index 74d162bf44f8..ff67ed769e2a 100644
--- a/pkgs/desktops/plasma-5.1/startkde/startkde.in
+++ b/pkgs/desktops/plasma-5.1/startkde/startkde.in
@@ -3,6 +3,27 @@
 #  NIXOS KDE STARTUP SCRIPT
 #
 
+# The KDE icon cache is supposed to update itself
+# automatically, but it uses the timestamp on the icon
+# theme directory as a trigger.  Since in Nix the
+# timestamp is always the same, this doesn't work.  So as
+# a workaround, nuke the icon cache on login.  This isn't
+# perfect, since it may require logging out after
+# installing new applications to update the cache.
+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
+rm -fv $HOME/.cache/icon-cache.kcache
+
+# Qt writes a weird ‘libraryPath’ line to
+# ~/.config/Trolltech.conf that causes the KDE plugin
+# paths of previous KDE invocations to be searched.
+# Obviously using mismatching KDE libraries is potentially
+# disastrous, so here we nuke references to the Nix store
+# in Trolltech.conf.  A better solution would be to stop
+# Qt from doing this wackiness in the first place.
+if [ -e $HOME/.config/Trolltech.conf ]; then
+    @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
+fi
+
 if test "x$1" = x--failsafe; then
     KDE_FAILSAFE=1 # General failsafe flag
     KWIN_COMPOSE=N # Disable KWin's compositing