push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,11 @@
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kservice";
# FIXME(later): the whole sycoca situation is very bad
patches = [
# explode less when sycoca is deleted
./handle-sycoca-deletion.patch
];
meta.mainProgram = "kbuildsycoca6";
}

View File

@@ -0,0 +1,14 @@
diff --git a/src/sycoca/ksycoca.cpp b/src/sycoca/ksycoca.cpp
index 981342e6..5940f65f 100644
--- a/src/sycoca/ksycoca.cpp
+++ b/src/sycoca/ksycoca.cpp
@@ -218,6 +218,10 @@ KSycoca::KSycoca()
connect(d->m_fileWatcher.get(), &KDirWatch::dirty, this, [this]() {
d->slotDatabaseChanged();
});
+ // NIXPKGS: we sometimes delete sycoca externally
+ connect(d->m_fileWatcher.get(), &KDirWatch::deleted, this, [this]() {
+ d->slotDatabaseChanged();
+ });
}
}