From efe31f4c5117841c6506f3a6ec7adf3c68c8bf9d Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 21:04:26 +0700
Subject: [PATCH 1/2] python3Packages.xkbcommon: migrate to pyproject

---
 pkgs/development/python-modules/xkbcommon/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xkbcommon/default.nix b/pkgs/development/python-modules/xkbcommon/default.nix
index b5edf3cc2415..7267b29f7ea4 100644
--- a/pkgs/development/python-modules/xkbcommon/default.nix
+++ b/pkgs/development/python-modules/xkbcommon/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   python,
+  setuptools,
   cffi,
   pkg-config,
   libxkbcommon,
@@ -12,17 +13,19 @@
 buildPythonPackage rec {
   pname = "xkbcommon";
   version = "1.5.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-rBdICNv2HTXZ2oBL8zuqx0vG8r4MEIWUrpPHnNFd3DY=";
   };
 
+  build-system = [ setuptools ];
+
   nativeBuildInputs = [ pkg-config ];
   propagatedNativeBuildInputs = [ cffi ];
   buildInputs = [ libxkbcommon ];
-  propagatedBuildInputs = [ cffi ];
+  dependencies = [ cffi ];
   nativeCheckInputs = [ pytestCheckHook ];
 
   postBuild = ''

From d6d54342267212ac1735f15149994e0a9c4af508 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 21:05:43 +0700
Subject: [PATCH 2/2] python3Packages.xkbcommon: modernize

---
 pkgs/development/python-modules/xkbcommon/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/xkbcommon/default.nix b/pkgs/development/python-modules/xkbcommon/default.nix
index 7267b29f7ea4..45f3a723ac39 100644
--- a/pkgs/development/python-modules/xkbcommon/default.nix
+++ b/pkgs/development/python-modules/xkbcommon/default.nix
@@ -10,13 +10,15 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "xkbcommon";
   version = "1.5.1";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-rBdICNv2HTXZ2oBL8zuqx0vG8r4MEIWUrpPHnNFd3DY=";
   };
 
@@ -43,4 +45,4 @@ buildPythonPackage rec {
       doronbehar
     ];
   };
-}
+})