diff --git a/pkgs/by-name/qu/quickshell/0001-fix-unneccessary-reloads.patch b/pkgs/by-name/qu/quickshell/0001-fix-unneccessary-reloads.patch deleted file mode 100644 index 85d4a74b9ad5..000000000000 --- a/pkgs/by-name/qu/quickshell/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/qu/quickshell/package.nix b/pkgs/by-name/qu/quickshell/package.nix index 551fd36566e4..53be131726b2 100644 --- a/pkgs/by-name/qu/quickshell/package.nix +++ b/pkgs/by-name/qu/quickshell/package.nix @@ -7,8 +7,9 @@ cmake, ninja, spirv-tools, + vulkan-headers, qt6, - breakpad, + cpptrace, jemalloc, cli11, wayland, @@ -19,10 +20,12 @@ libgbm, pipewire, pam, + glib, + polkit, }: stdenv.mkDerivation (finalAttrs: { pname = "quickshell"; - version = "0.2.1"; + version = "0.3.0"; # github mirror: https://github.com/quickshell-mirror/quickshell src = fetchFromGitea { @@ -30,17 +33,15 @@ stdenv.mkDerivation (finalAttrs: { owner = "quickshell"; repo = "quickshell"; tag = "v${finalAttrs.version}"; - hash = "sha256-e++Ogy91Sv7gGLMdAqZaBzbH/UmPWZ4GAt7VDCA66aU="; + hash = "sha256-gU+VGpwGJ2vvg0mtYqVvj5u+2LteuHlpokH6JSAtueY="; }; - patches = [ - ./0001-fix-unneccessary-reloads.patch - ]; nativeBuildInputs = [ cmake ninja qt6.qtshadertools spirv-tools + vulkan-headers wayland-scanner qt6.wrapQtAppsHook pkg-config @@ -56,16 +57,17 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols libdrm libgbm - breakpad + cpptrace jemalloc libxcb pam pipewire + glib + polkit ]; cmakeFlags = [ (lib.cmakeFeature "DISTRIBUTOR" "Nixpkgs") - (lib.cmakeBool "DISTRIBUTOR_DEBUGINFO_AVAILABLE" true) (lib.cmakeFeature "INSTALL_QML_PREFIX" qt6.qtbase.qtQmlPrefix) (lib.cmakeFeature "GIT_REVISION" "tag-v${finalAttrs.version}") ];