From 1eda97a42d984e168db1ee0502187432af647167 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 16 Oct 2025 08:27:36 +0200 Subject: [PATCH] lenovo-legion: build with qt6; modernize --- pkgs/os-specific/linux/lenovo-legion/app.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/os-specific/linux/lenovo-legion/app.nix index 652d4ea29d88..81b3468c5a10 100644 --- a/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -5,12 +5,13 @@ wrapQtAppsHook, python3, nix-update-script, + qtbase, }: python3.pkgs.buildPythonApplication rec { pname = "lenovo-legion-app"; version = "0.0.20-unstable-2025-07-11"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "johnfanv2"; @@ -21,10 +22,14 @@ python3.pkgs.buildPythonApplication rec { sourceRoot = "${src.name}/python/legion_linux"; - nativeBuildInputs = [ wrapQtAppsHook ]; + build-system = with python3.pkgs; [ + setuptools + wrapQtAppsHook + ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ pyqt6 + qtbase argcomplete pillow pyyaml diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 294a73b11b90..3e1748a00cee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11719,7 +11719,7 @@ with pkgs; lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; - lenovo-legion = libsForQt5.callPackage ../os-specific/linux/lenovo-legion/app.nix { }; + lenovo-legion = qt6Packages.callPackage ../os-specific/linux/lenovo-legion/app.nix { }; libkiwix = callPackage ../applications/misc/kiwix/lib.nix { };