Unverified Commit 8576f116 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

quickshell: fix unneccessary reloads (#483139)

parents 54f14be7 81b215a6

pkgs/by-name/qu/quickshell/0001-fix-unneccessary-reloads.patch

0 → 100644
+23 −0
Original line number Diff line number Diff line 
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());

 			}

pkgs/by-name/qu/quickshell/package.nix

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ stdenv.mkDerivation (finalAttrs: { 
    tag = "v${finalAttrs.version}";

    hash = "sha256-e++Ogy91Sv7gGLMdAqZaBzbH/UmPWZ4GAt7VDCA66aU=";

  };

  patches = [

    ./0001-fix-unneccessary-reloads.patch

  ];



  nativeBuildInputs = [

    cmake