From 993e8f1b52613ffead331d4b234acb427600a20b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 23 Dec 2025 14:55:16 +0200 Subject: [PATCH] python3.pkgs.qtile: put wayland-scanner in nativeBuildInputs --- .../python-modules/qtile/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index e303bd4e0514..9862cf8a4145 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, cairocffi, dbus-fast, aiohttp, @@ -47,12 +48,29 @@ buildPythonPackage rec { hash = "sha256-PPyI+IGvHBQusVmU3D26VjYjLaa9+94KUqNwbQSzeaI="; }; + patches = [ + # The patch below makes upstream's build script search for wayland-scanner + # simply in $PATH, and not via `pkg-config`. This allows us to put + # wayland-scanner in nativeBuildInputs and keep using `strictDeps`. See: + # + # https://github.com/qtile/qtile/pull/5726 + # + # Upstream has merged the PR directly - without creating a merge commit, so + # using a range is required. + (fetchpatch { + name = "qtile-PR5726-wayland-scanner-pkg-config.patch"; + url = "https://github.com/qtile/qtile/compare/f0243abee5e6b94ef92b24e99d09037a4f40272b..553845bd17f38a6d1dee763a23c1b015df894794.patch"; + hash = "sha256-hRArLC4nQMAbT//QhQeAUL1o7OCV0zvrlJztDavI0K0="; + }) + ]; + build-system = [ setuptools setuptools-scm ]; nativeBuildInputs = [ pkg-config + wayland-scanner ]; env = { @@ -95,7 +113,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - wayland-scanner wayland-protocols cffi xcffib