From 3360828adbdc2e5cab74850343eda5637a695f69 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 18 Jul 2025 12:27:17 +0200 Subject: [PATCH] python3Packages.pyqt6: add optional serial port support Re-add optional serial port support which was present in PyQt5 package. --- pkgs/development/python-modules/pyqt/6.x.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 39151a7ff25a..be45d1fdff6e 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -19,6 +19,7 @@ # Not currently part of PyQt6 #, withConnectivity ? true withPrintSupport ? true, + withSerialPort ? false, cups, }: @@ -103,7 +104,8 @@ buildPythonPackage rec { # ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withMultimedia qtmultimedia ++ lib.optional withWebSockets qtwebsockets - ++ lib.optional withLocation qtlocation; + ++ lib.optional withLocation qtlocation + ++ lib.optional withSerialPort qtserialport; buildInputs = with qt6Packages; @@ -117,7 +119,8 @@ buildPythonPackage rec { ] # ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withWebSockets qtwebsockets - ++ lib.optional withLocation qtlocation; + ++ lib.optional withLocation qtlocation + ++ lib.optional withSerialPort qtserialport; propagatedBuildInputs = # ld: library not found for -lcups @@ -127,6 +130,7 @@ buildPythonPackage rec { inherit sip pyqt6-sip; multimediaEnabled = withMultimedia; WebSocketsEnabled = withWebSockets; + serialPortEnabled = withSerialPort; }; dontConfigure = true; @@ -145,7 +149,8 @@ buildPythonPackage rec { ++ lib.optional withWebSockets "PyQt6.QtWebSockets" ++ lib.optional withMultimedia "PyQt6.QtMultimedia" # ++ lib.optional withConnectivity "PyQt6.QtConnectivity" - ++ lib.optional withLocation "PyQt6.QtPositioning"; + ++ lib.optional withLocation "PyQt6.QtPositioning" + ++ lib.optional withSerialPort "PyQt6.QtSerialPort"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-address-of-temporary";