04/21: gnu: python-pyqt: Fix build for new python-sip.

[guix-commits]

lfam pushed a commit to branch wip-update-calibre
in repository guix.

commit caac883f292e9db7fd3d0723c9d05b53d7f04ec8
Author: Brendan Tildesley <mail@brendan.scot>
AuthorDate: Mon Feb 22 22:20:40 2021 +1100

    gnu: python-pyqt: Fix build for new python-sip.
    
    * gnu/packages/qt.scm (python-pyqt)
    [source]: Remove pyqt-public-sip.patch. PyQt uses python-pyqt5-sip now. This
    patch is still used by python2-pyqt so we don't delete it completely.
    [propagated-inputs]: Add python-pyqt5-sip.
---
 gnu/packages/qt.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d604a9c..530fcf1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1903,17 +1903,17 @@ module provides support functions to the automatically 
generated code.")
                    (string-append "https://www.riverbankcomputing.com/static/";
                                   "Downloads/PyQt5/" version "/PyQt5-"
                                   version ".tar.gz")))
-        (file-name (string-append "PyQt5-"version ".tar.gz"))
+        (file-name (string-append "PyQt5-" version ".tar.gz"))
         (sha256
          (base32
           "1z74295i69cha52llsqffzhb5zz7qnbjc64h8qg21l91jgf0harp"))
-       (patches (search-patches "pyqt-configure.patch"
-                                "pyqt-public-sip.patch"))))
+        (patches (search-patches "pyqt-configure.patch"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("qtbase" ,qtbase))) ; for qmake
     (propagated-inputs
-     `(("python-sip" ,python-sip)))
+     `(("python-sip" ,python-sip)
+       ("python-pyqt5-sip" ,python-pyqt5-sip)))
     (inputs
      `(("python" ,python-wrapper)
        ("qtbase" ,qtbase)