From 3dcbac45ef6b6d780920104bf2144652b2a6668f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 31 Aug 2020 10:38:29 -0700 Subject: [PATCH] python3Packages.pyqt5_with_qtwebkit: restore --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0dab3dcfdf..611717b60f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5171,6 +5171,13 @@ in { pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; + /* + `pyqt5_with_qtwebkit` should not be used by python libraries in + pkgs/development/python-modules/*. Putting this attribute in + `propagatedBuildInputs` may cause collisions. + */ + pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; + pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; };