Merge pull request #161100 from chvp/bump-pywlroots

pkgs/development/python-modules/pywlroots/default.nix

@@ -18,18 +18,13 @@
 
 buildPythonPackage rec {
   pname = "pywlroots";
-  version = "0.15.8";
+  version = "0.15.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5oKeiNRO/5/6gWHPgatn0sHRtPL2B2Fa7S1A7LWr0qM=";
+    sha256 = "V6P5zAvr0L7p+yEjr6To2rKoMPqxIvSPrlLzf6yj3WA=";
   };
 
-  # The XWayland detection uses some hard-coded FHS paths. Since we
-  # know wlroots was built with xwayland support, replace its
-  # detection with `return True`.
-  patches = [ ./xwayland.patch ];
-
   nativeBuildInputs = [ pkg-config ];
   propagatedNativeBuildInputs = [ cffi ];
   buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ];

pkgs/development/python-modules/pywlroots/xwayland.patch

@@ -1,25 +0,0 @@
-diff --git a/wlroots/ffi_build.py b/wlroots/ffi_build.py
-index bb07ff8..f19efe3 100644
---- a/wlroots/ffi_build.py
-+++ b/wlroots/ffi_build.py
-@@ -55,19 +55,7 @@ def has_xwayland() -> bool:
-     Check for XWayland headers. If present, wlroots was built with XWayland support, so
-     pywlroots can be too.
-     """
--    try:
--        FFI().verify(
--            "#include <wlr/xwayland.h>",
--            define_macros=[("WLR_USE_UNSTABLE", 1)],
--            include_dirs=["/usr/include/pixman-1", include_dir.as_posix()],
--        )
--        return True
--    except VerificationError:
--        print("If XWayland support is not required, ignore the above error message.")
--        print(
--            "If support is required, ensure wlroots was built with -Dxwayland=enabled."
--        )
--        return False
-+    return True
- 
- 
- # backend.h