From 907c48e3ca7606f0357982b5960fc3abcedd2316 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 27 Jun 2025 09:49:06 -0400 Subject: [PATCH] plover.dev: add better parameterization --- pkgs/applications/misc/plover/default.nix | 33 +++++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index a26ffa27ea8a..ec14f6f94d48 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -2,13 +2,36 @@ lib, config, stdenv, - buildPythonPackage ? python3Packages.buildPythonPackage, + plover, fetchFromGitHub, + fetchpatch, versionCheckHook, python3Packages, libsForQt5, }: +let + inherit (python3Packages) + buildPythonPackage + appdirs + babel + evdev + mock + pyqt5 + pyserial + pytestCheckHook + pytest-qt + plover-stroke + rtf-tokenize + setuptools + wcwidth + wheel + xlib + ; + inherit (libsForQt5) + wrapQtAppsHook + ; +in { dev = ( buildPythonPackage rec { @@ -27,13 +50,13 @@ sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason ''; - build-system = with python3Packages; [ + build-system = [ babel setuptools pyqt5 wheel ]; - dependencies = with python3Packages; [ + dependencies = [ appdirs evdev pyqt5 @@ -44,11 +67,11 @@ wcwidth xlib ]; - nativeBuildInputs = with libsForQt5; [ + nativeBuildInputs = [ wrapQtAppsHook ]; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = [ pytestCheckHook versionCheckHook pytest-qt