guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/08: gnu: Calibre: Remove a transitive dependency on QtWebKit.


From: guix-commits
Subject: 05/08: gnu: Calibre: Remove a transitive dependency on QtWebKit.
Date: Fri, 28 Jan 2022 14:40:44 -0500 (EST)

lfam pushed a commit to branch master
in repository guix.

commit 229759833dbde298d6ab44818f1c6bc140865a33
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Fri Jan 28 12:34:58 2022 -0500

    gnu: Calibre: Remove a transitive dependency on QtWebKit.
    
    See <https://issues.guix.gnu.org/53289> for more information about this 
change.
    
    * gnu/packages/ebook.scm (calibre)[inputs]: Replace python-pyqt with
    python-pyqt-without-qtwebkit.
    [arguments]: Adjust the custom 'configure' phase accordingly.
---
 gnu/packages/ebook.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 207bbfcdaf..0875dae190 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -198,7 +198,7 @@ with Microsoft Compiled HTML (CHM) files")
        ("python-pychm" ,python-pychm)
        ("python-pycryptodome" ,python-pycryptodome)
        ("python-pygments" ,python-pygments)
-       ("python-pyqt" ,python-pyqt)
+       ("python-pyqt-without-qtwebkit" ,python-pyqt-without-qtwebkit)
        ("python-pyqtwebengine" ,python-pyqtwebengine)
        ("python-regex" ,python-regex)
        ("python-speechd" ,speech-dispatcher)
@@ -238,7 +238,7 @@ with Microsoft Compiled HTML (CHM) files")
          (add-before 'build 'configure
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (let ((podofo (assoc-ref inputs "podofo"))
-                  (pyqt (assoc-ref inputs "python-pyqt"))
+                  (pyqt (assoc-ref inputs "python-pyqt-without-qtwebkit"))
                   (python-sip (assoc-ref inputs "python-sip"))
                   (out (assoc-ref outputs "out")))
               (substitute* "setup/build.py"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]