~ruther/guix-local: gnu: calibre: Build with non-modular Qt.

0e5f60615901bfb6d414cc96061998d4291da0c4 — Andreas Enge 9 years ago 4a8c35e

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 <roel@gnu.org>.

patch browse .tar.gz

1 files changed, 3 insertions(+), 3 deletions(-)

M gnu/packages/ebook.scm

M gnu/packages/ebook.scm => gnu/packages/ebook.scm +3 -3

@@ 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