From c2b4106a25c58dbdc25c0cd9d1834fd37645d37b Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 12 Mar 2025 16:41:37 +0800 Subject: [PATCH] python3Packages.pyqt6: fix support for dbus-python --- pkgs/development/python-modules/pyqt/6.x.nix | 3 +-- .../pyqt/pyqt6-fix-dbus-mainloop-support.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/pyqt/pyqt6-fix-dbus-mainloop-support.patch diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index eba98a79c9c8..ad7ee1e1ff61 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -38,8 +38,7 @@ buildPythonPackage rec { patches = [ # Fix some wrong assumptions by ./project.py # TODO: figure out how to send this upstream - # FIXME: make a version for PyQt6? - # ./pyqt5-fix-dbus-mainloop-support.patch + ./pyqt6-fix-dbus-mainloop-support.patch # confirm license when installing via pyqt6_sip ./pyqt5-confirm-license.patch # Fix build with Qt 6.8.2 diff --git a/pkgs/development/python-modules/pyqt/pyqt6-fix-dbus-mainloop-support.patch b/pkgs/development/python-modules/pyqt/pyqt6-fix-dbus-mainloop-support.patch new file mode 100644 index 000000000000..382f37163326 --- /dev/null +++ b/pkgs/development/python-modules/pyqt/pyqt6-fix-dbus-mainloop-support.patch @@ -0,0 +1,11 @@ +--- a/project.py ++++ b/project.py +@@ -247,7 +247,7 @@ + dbus_lib_dirs = [] + dbus_libs = [] + +- args = ['pkg-config', '--cflags-only-I', '--libs dbus-1'] ++ args = ['pkg-config', '--cflags-only-I', '--libs dbus-1', 'dbus-python'] + + for line in self.read_command_pipe(args, fatal=False): + for flag in line.strip().split():