diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-07 14:07:08 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-07 15:11:04 -0500 |
commit | 393b359f13f1685c1a1d4bae4f89fa0ead726ce5 (patch) | |
tree | a474220d47c2a67b4f58c28c0b997f3de05acff8 /pkgs | |
parent | 1847b85f152897ed34c95aa48dad05cb2c4a2e40 (diff) | |
download | nixpkgs-393b359f13f1685c1a1d4bae4f89fa0ead726ce5.tar nixpkgs-393b359f13f1685c1a1d4bae4f89fa0ead726ce5.tar.gz nixpkgs-393b359f13f1685c1a1d4bae4f89fa0ead726ce5.tar.bz2 nixpkgs-393b359f13f1685c1a1d4bae4f89fa0ead726ce5.tar.lz nixpkgs-393b359f13f1685c1a1d4bae4f89fa0ead726ce5.tar.xz nixpkgs-393b359f13f1685c1a1d4bae4f89fa0ead726ce5.tar.zst nixpkgs-393b359f13f1685c1a1d4bae4f89fa0ead726ce5.zip |
plasma: handle ksycoca5 better
- Remove xdg-desktop-menu-dummy.menu kbuildsycoca5. Not sure why we need it but it is a pretty big failure if it exists. See issue #56176. - plasma: clear ksycoca cache before building This is needed to pick up on software removed since the last cache update. Otherwise it hangs around as zombies forever (or until the cache is cleared). - Add the above + the icon cache cleanup to plasmaSetup This will be run for the logged in user on each nixos-rebuild. Unfortunately this only works if you are managing software through nixos-rebuild (nix-env users need to run this manually, otherwise log out and log back in).
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index dd5f7321f0e..dde4a3c819f 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -81,7 +81,7 @@ index 714a9bf1..9733c612 100644 fi # Boot sequence: -@@ -33,61 +42,133 @@ fi +@@ -33,61 +42,142 @@ fi # # * Then ksmserver is started which takes control of the rest of the startup sequence @@ -102,6 +102,15 @@ index 714a9bf1..9733c612 100644 +# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html +rm -fv $HOME/.cache/icon-cache.kcache + ++# xdg-desktop-settings generates this empty file but ++# it makes kbuildsyscoca5 fail silently. To fix this ++# remove that menu if it exists. ++rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu ++ ++# Remove the kbuildsyscoca5 cache. It will be regenerated immediately after. ++# This is necessary for kbuildsyscoca5 to recognize that software that has been removed. ++rm -fv $HOME/.cache/ksycoca* ++ +# Qt writes a weird ‘libraryPath’ line to +# ~/.config/Trolltech.conf that causes the KDE plugin +# paths of previous KDE invocations to be searched. @@ -721,7 +730,7 @@ diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacomposit index dd9e304d..12132f9e 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake -@@ -1,118 +1,165 @@ +@@ -1,118 +1,174 @@ #!/bin/sh # -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) @@ -749,6 +758,15 @@ index dd9e304d..12132f9e 100644 +# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html +rm -fv $HOME/.cache/icon-cache.kcache + ++# xdg-desktop-settings generates this empty file but ++# it makes kbuildsyscoca5 fail silently. To fix this ++# remove that menu if it exists. ++rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu ++ ++# Remove the kbuildsyscoca5 cache. It will be regenerated immediately after. ++# This is necessary for kbuildsyscoca5 to recognize that software that has been removed. ++rm -fv $HOME/.cache/ksycoca* ++ +# Qt writes a weird ‘libraryPath’ line to +# ~/.config/Trolltech.conf that causes the KDE plugin +# paths of previous KDE invocations to be searched. |