aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2016-07-25 23:47:13 +0200
committerAndreas Enge <andreas@enge.fr>2016-07-26 00:38:39 +0200
commit0e5f60615901bfb6d414cc96061998d4291da0c4 (patch)
tree3b3ac493fc7d4a777f982821b14ce2547dc3dd46
parent4a8c35e143a2e7101a6c3a96b67a02f2f8825984 (diff)
downloadguix-0e5f60615901bfb6d414cc96061998d4291da0c4.tar
guix-0e5f60615901bfb6d414cc96061998d4291da0c4.tar.gz
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>.
-rw-r--r--gnu/packages/ebook.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 69946b1e78..d97e869ccf 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