noctalia-qs: 0.0.10 -> 0.0.12 (#505125)

This commit is contained in:
Peder Bergebakken Sundt
2026-05-08 21:51:48 +00:00
committed by GitHub
2 changed files with 5 additions and 32 deletions
@@ -1,23 +0,0 @@
diff --git a/src/core/generation.cpp b/src/core/generation.cpp
index c68af71..4967562 100644
--- a/src/core/generation.cpp
+++ b/src/core/generation.cpp
@@ -172,12 +172,18 @@ void EngineGeneration::setWatchingFiles(bool watching) {
if (this->watcher == nullptr) {
this->watcher = new QFileSystemWatcher();
+ // note: not using canonicalFilePath() here on purpose,
+ // since the path could be a link to the nix store
+ // and the link might change
+
for (auto& file: this->scanner.scannedFiles) {
+ if (file.startsWith("/nix/store/")) continue;
this->watcher->addPath(file);
this->watcher->addPath(QFileInfo(file).dir().absolutePath());
}
for (auto& file: this->extraWatchedFiles) {
+ if (file.startsWith("/nix/store/")) continue;
this->watcher->addPath(file);
this->watcher->addPath(QFileInfo(file).dir().absolutePath());
}
+5 -9
View File
@@ -26,19 +26,15 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "noctalia-qs";
version = "0.0.10";
version = "0.0.12";
src = fetchFromGitHub {
owner = "noctalia-dev";
repo = "noctalia-qs";
tag = "v${finalAttrs.version}";
hash = "sha256-tscUYNjBfi52Uwu40epdAhoFztsmroKBEBvr22oCnv4=";
hash = "sha256-79JP2QTdvp1jg7HGxAW+xzhzhLnlKUi8yGXq9nDCeH0=";
};
patches = [
./0001-fix-unneccessary-reloads.patch
];
nativeBuildInputs = [
cmake
ninja
@@ -74,11 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "DISTRIBUTOR_DEBUGINFO_AVAILABLE" true)
(lib.cmakeFeature "INSTALL_QML_PREFIX" qt6.qtbase.qtQmlPrefix)
(lib.cmakeFeature "GIT_REVISION" "tag-v${finalAttrs.version}")
(lib.cmakeBool "NIX_STORE_DIR_SKIP_WATCH" true)
(lib.cmakeFeature "NIX_STORE_DIR" builtins.storeDir)
];
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
dontStrip = false;
cmakeBuildType = "Release";
passthru.updateScript = nix-update-script { };