nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 76806c54ed.

Reported by Roel Janssen <roel@gnu.org>.
This commit is contained in:
Andreas Enge 2016-07-25 23:47:13 +02:00
parent 4a8c35e143
commit 0e5f606159
No known key found for this signature in database
GPG Key ID: F7D5C9BF765C61E3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/ebook.scm
View File

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