TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: calibre: Clean up 'wrap phase.

Browse source 
Based on the suggestion of the author, this commit cleans up the
changes introduced by fd3eac4dd7

For more information, see: https://issues.guix.gnu.org/43249

* gnu/packages/e-book.scm (calibre):
[arguments]: Remove the manual 'wrap phase replacement and add a
'wrap-program phase after standard 'wrap phase to make the runtime
dependency QtWebEngineProcess available to the binaries.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Prafulla Giri 2020-09-15 17:13:36 +05:45 committed by Mathieu Othacehe
parent 47640ca67d
commit d9dec1473d
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gnu/packages/ebook.scm
View file

@ -252,29 +252,7 @@ (define-public calibre
"--path-to-mathjax" (string-append
(assoc-ref inputs "js-mathjax")
"/share/javascript/mathjax"))
(invoke "python2" "setup.py" "rapydscript")))
(replace 'wrap
;; Here we wrap PYTHONPATH exactly as it would be in
;; python-build-system, plus the addition of
;; QTWEBENGINEPROCESS_PATH, fixing a bug where Calibre would not
;; find Qtwebengine.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(python (assoc-ref inputs "python"))
(site-packages
(cons (string-append out "/lib/python"
(python-version python)
"/site-packages")
(search-path-as-string->list (getenv "PYTHONPATH"))))
(qtwebengineprocess
(string-append (assoc-ref inputs "qtwebengine")
"/lib/qt5/libexec/QtWebEngineProcess")))
(for-each (lambda (program)
(wrap-program program
`("QTWEBENGINEPROCESS_PATH" = (,qtwebengineprocess))
`("PYTHONPATH" prefix ,site-packages)))
(find-files bin ".")))
(invoke "python2" "setup.py" "rapydscript")
#t))
(add-after 'install 'install-man-pages
(lambda* (#:key outputs #:allow-other-keys)
@ -292,6 +270,28 @@ (define-public calibre
"/share/fonts/truetype")))
(delete-file-recursively font-dest)
(symlink font-src font-dest))
#t))
;; Make run-time dependencies available to the binaries.
(add-after 'wrap 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(qtwebengine (assoc-ref inputs "qtwebengine")))
(with-directory-excursion (string-append out "/bin")
(for-each
(lambda (binary)
(wrap-program binary
;; Make QtWebEngineProcess available.
`("QTWEBENGINEPROCESS_PATH" ":" =
,(list (string-append
qtwebengine
"/lib/qt5/libexec/QtWebEngineProcess")))))
;; Wrap all the binaries shipping with the package, except
;; for the wrappings created during the 'wrap standard
;; phase. This extends existing .calibre-real wrappers
;; rather than create ..calibre-real-real-s. For more
;; information see: https://issues.guix.gnu.org/43249.
(find-files "." (lambda (file stat)
(not (wrapper? file)))))))
#t)))))
(home-page "https://calibre-ebook.com/")
(synopsis "E-book library management software")