diff options
| author | K900 <me@0upti.me> | 2024-04-09 08:28:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-09 08:28:52 +0300 |
| commit | 8a71147d5463d96e8a8759571e2a5d44ecc3e600 (patch) | |
| tree | 396ccdae0cb57b80db1e5815bb5a6e6aea76cac4 | |
| parent | Merge pull request #302753 from K900/yassi-license (diff) | |
| download | nixpkgs-origin/revert-302271-kglobalaccel-shortcuts-hack.tar.gz | |
Revert "kdePackages.kglobalacceld: hack around ksycoca breakage"origin/revert-302271-kglobalaccel-shortcuts-hack
| -rw-r--r-- | pkgs/kde/plasma/kglobalacceld/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/kde/plasma/kglobalacceld/dont-delete-shortcuts.patch | 14 |
2 files changed, 0 insertions, 19 deletions
diff --git a/pkgs/kde/plasma/kglobalacceld/default.nix b/pkgs/kde/plasma/kglobalacceld/default.nix index 495392430e17..caafb6c91347 100644 --- a/pkgs/kde/plasma/kglobalacceld/default.nix +++ b/pkgs/kde/plasma/kglobalacceld/default.nix @@ -1,9 +1,4 @@ {mkKdeDerivation}: mkKdeDerivation { pname = "kglobalacceld"; - - # Don't delete shortcuts when applications disappear from sycoca, - # because for us they sometimes do. - # FIXME: make them actually not do that instead. - patches = [./dont-delete-shortcuts.patch]; } diff --git a/pkgs/kde/plasma/kglobalacceld/dont-delete-shortcuts.patch b/pkgs/kde/plasma/kglobalacceld/dont-delete-shortcuts.patch deleted file mode 100644 index 497217616ef9..000000000000 --- a/pkgs/kde/plasma/kglobalacceld/dont-delete-shortcuts.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/globalshortcutsregistry.cpp b/src/globalshortcutsregistry.cpp -index 3cbaded..9adcf38 100644 ---- a/src/globalshortcutsregistry.cpp -+++ b/src/globalshortcutsregistry.cpp -@@ -909,7 +909,8 @@ void GlobalShortcutsRegistry::refreshServices() - return false; - } - -- return true; -+ qCDebug(KGLOBALACCELD) << "NIXPKGS: component" << component->uniqueName() << "disappeared, keeping shortcuts anyway"; -+ return false; - }); - - m_components.erase(it, m_components.end()); |