From 3e8e73b859a05ad8253a6ec48c06e1fa7da63782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alice=20=E2=9C=A8=F0=9F=8C=99=20Luna?= Date: Tue, 31 Mar 2026 00:14:00 +0200 Subject: [PATCH] noctalia-qs: 0.0.10 -> 0.0.12 This update removes the 0001-fix-unneccessary-reloads.patch, because it has been upstreamed to noctalia-qs, see https://github.com/noctalia-dev/noctalia-qs/pull/20. Furthermore, the cmake build is now a release build to match the upstream flake. --- .../0001-fix-unneccessary-reloads.patch | 23 ------------------- pkgs/by-name/no/noctalia-qs/package.nix | 14 ++++------- 2 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 pkgs/by-name/no/noctalia-qs/0001-fix-unneccessary-reloads.patch diff --git a/pkgs/by-name/no/noctalia-qs/0001-fix-unneccessary-reloads.patch b/pkgs/by-name/no/noctalia-qs/0001-fix-unneccessary-reloads.patch deleted file mode 100644 index 85d4a74b9ad5..000000000000 --- a/pkgs/by-name/no/noctalia-qs/0001-fix-unneccessary-reloads.patch +++ /dev/null @@ -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()); - } diff --git a/pkgs/by-name/no/noctalia-qs/package.nix b/pkgs/by-name/no/noctalia-qs/package.nix index 1546b1cd3411..f11d123ae1ba 100644 --- a/pkgs/by-name/no/noctalia-qs/package.nix +++ b/pkgs/by-name/no/noctalia-qs/package.nix @@ -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 { };