From a56f7192d61cca701bb67cc98c073407eb79d520 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 2 Sep 2026 00:29:31 +0200 Subject: [PATCH] aw-qt: use top-level callPackage --- pkgs/applications/office/activitywatch/default.nix | 10 ++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix index 50e158704a5d..c89ece308897 100644 --- a/pkgs/applications/office/activitywatch/default.nix +++ b/pkgs/applications/office/activitywatch/default.nix @@ -9,9 +9,7 @@ rust-jemalloc-sys, python3, python3Packages, - wrapQtAppsHook, - qtbase, - qtsvg, + qt6, xdg-utils, replaceVars, nodejs_22, @@ -103,14 +101,14 @@ rec { dependencies = with python3Packages; [ aw-core - qtbase - qtsvg # Rendering icons in the trayicon menu + qt6.qtbase + qt6.qtsvg # Rendering icons in the trayicon menu pyqt6 click ]; nativeBuildInputs = [ - wrapQtAppsHook + qt6.wrapQtAppsHook ]; # Prevent double wrapping diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b3c7c74cdff..099a1b085bca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8247,7 +8247,7 @@ with pkgs; patches = config."2bwm".patches or [ ]; }; - inherit (qt6Packages.callPackage ../applications/office/activitywatch { }) + inherit (callPackage ../applications/office/activitywatch { }) aw-qt aw-notify aw-server-rust