From 015fa4e53e0ff069abbea93ccecc9c84571311fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= <esm@eduardosm.net>
Date: Fri, 25 Jun 2021 20:16:53 +0200
Subject: [PATCH] python3Packages.pyqt5: use python callPackage instead of qt5
 callPackage

---
 pkgs/development/python-modules/pyqt/5.x.nix | 37 ++++++++++----------
 pkgs/top-level/python-packages.nix           |  4 +--
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 95f2ab4673a5..ae737ca2e638 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,25 +1,27 @@
-{ lib, pythonPackages, pkg-config
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, pkg-config
 , dbus
-, qmake, lndir
-, qtbase
-, qtsvg
-, qtdeclarative
-, qtwebchannel
-, withConnectivity ? false, qtconnectivity
-, withMultimedia ? false, qtmultimedia
-, withWebKit ? false, qtwebkit
-, withWebSockets ? false, qtwebsockets
+, lndir
+, python
+, dbus-python
+, sip
+, pyqt-builder
+, libsForQt5
+, withConnectivity ? false
+, withMultimedia ? false
+, withWebKit ? false
+, withWebSockets ? false
 }:
 
 let
-
-  inherit (pythonPackages) buildPythonPackage python isPy27 dbus-python sip pyqt-builder;
-
   pyqt5_sip = buildPythonPackage rec {
     pname = "PyQt5_sip";
     version = "12.9.0";
 
-    src = pythonPackages.fetchPypi {
+    src = fetchPypi {
       inherit pname version;
       sha256 = "0cmfxb7igahxy74qkq199l6zdxrr75bnxris42fww3ibgjflir6k";
     };
@@ -28,7 +30,6 @@ let
     # > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory
     doCheck = false;
   };
-
 in buildPythonPackage rec {
   pname = "PyQt5";
   version = "5.15.4";
@@ -36,7 +37,7 @@ in buildPythonPackage rec {
 
   disabled = isPy27;
 
-  src = pythonPackages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "1gp5jz71nmg58zsm1h4vzhcphf36rbz37qgsfnzal76i1mz5js9a";
   };
@@ -45,7 +46,7 @@ in buildPythonPackage rec {
 
   dontWrapQtApps = true;
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with libsForQt5; [
     pkg-config
     qmake
     lndir
@@ -61,7 +62,7 @@ in buildPythonPackage rec {
     ++ lib.optional withWebSockets qtwebsockets
   ;
 
-  buildInputs = [
+  buildInputs = with libsForQt5; [
     dbus
     qtbase
     qtsvg
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f4cac7833423..ada93c6755ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6309,9 +6309,7 @@ in {
 
   pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { };
 
-  pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix {
-    pythonPackages = self;
-  };
+  pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { };
 
   pyqt5_with_qtmultimedia = self.pyqt5.override {
     withMultimedia = true;