03/03: gnu: calibre: Build with non-modular Qt.

[Andreas Enge]

andreas pushed a commit to branch master
in repository guix.

commit 0e5f60615901bfb6d414cc96061998d4291da0c4
Author: Andreas Enge <address@hidden>
Date:   Mon Jul 25 23:47:13 2016 +0200

    gnu: calibre: Build with non-modular Qt.
    
    * gnu/packages/ebook.scm (calibre)[native-inputs]: Replace QTBASE by QT.
    [inputs]: Replace QTBASE by QT and PYTHON2-PYQT by PYTHON2-PYQT-5.5.
    
    This essentially reverts commit 76806c54ed72f8f04079bbb187b186b833c103e1.
    
    Reported by Roel Janssen <address@hidden>.
---
 gnu/packages/ebook.scm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 69946b1..d97e869 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -83,7 +83,7 @@
     (build-system python-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qtbase" ,qtbase) ; for qmake
+       ("qt" ,qt) ; for qmake
        ;; xdg-utils is supposed to be used for desktop integration, but it
        ;; also creates lots of messages
        ;; mkdir: cannot create directory '/homeless-shelter': Permission denied
@@ -119,9 +119,9 @@
        ("python2-mechanize" ,python2-mechanize)
        ("python2-netifaces" ,python2-netifaces)
        ("python2-pillow" ,python2-pillow)
-       ("python2-pyqt" ,python2-pyqt)
+       ("python2-pyqt" ,python2-pyqt-5.5)
        ("python2-sip" ,python2-sip)
-       ("qtbase" ,qtbase)
+       ("qt" ,qt)
        ("sqlite" ,sqlite)))
     (arguments
      `(#:python ,python-2