[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/23: gnu: calibre: Use "linux.py" to install desktop files.
From: |
guix-commits |
Subject: |
12/23: gnu: calibre: Use "linux.py" to install desktop files. |
Date: |
Sun, 5 May 2019 11:15:25 -0400 (EDT) |
dannym pushed a commit to branch master
in repository guix.
commit 6e1ab5fadbc8fbe5d8d71864c68dd52ddbc732c9
Author: Brendan Tildesley <address@hidden>
Date: Sat May 4 02:42:20 2019 +1000
gnu: calibre: Use "linux.py" to install desktop files.
* gnu/packages/ebook.scm (calibre)[arguments]<#:phases>[configure]: Modify.
[install-mimetypes]: Remove.
Signed-off-by: Danny Milosavljevic <address@hidden>
---
gnu/packages/ebook.scm | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 2b557ab..964fdd7 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -102,9 +102,6 @@
(native-inputs
`(("pkg-config" ,pkg-config)
("qtbase" ,qtbase) ; 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
("python2-flake8" ,python2-flake8)
("xdg-utils" ,xdg-utils)))
;; Beautifulsoup3 is bundled but obsolete and not packaged, so just leave
it bundled.
@@ -174,15 +171,24 @@
"href=\"favicon.ico\""))
#t))
(add-before 'build 'configure
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((podofo (assoc-ref inputs "podofo"))
- (pyqt (assoc-ref inputs "python2-pyqt")))
+ (pyqt (assoc-ref inputs "python2-pyqt"))
+ (out (assoc-ref outputs "out")))
(substitute* "setup/build_environment.py"
(("sys.prefix") (string-append "'" pyqt "'")))
(substitute* "src/calibre/ebooks/pdf/pdftohtml.py"
(("PDFTOHTML = 'pdftohtml'")
(string-append "PDFTOHTML = \"" (assoc-ref inputs "poppler")
- "/bin/pdftohtml\"")))
+ "/bin/pdftohtml\"")))
+
+ ;; Calibre thinks we are installing desktop files into a home
+ ;; directory, but here we butcher the script in to installing
+ ;; to calibres /share directory.
+ (setenv "XDG_DATA_HOME" (string-append out "/share"))
+ (substitute* "src/calibre/linux.py"
+ (("'~/.local/share'") "''"))
+
(setenv "PODOFO_INC_DIR" (string-append podofo
"/include/podofo"))
(setenv "PODOFO_LIB_DIR" (string-append podofo "/lib"))
;; This informs the tests we are a continuous integration
@@ -204,12 +210,6 @@
"/share/fonts/truetype")))
(delete-file-recursively font-dest)
(symlink font-src font-dest))
- #t))
- (add-after 'unbundle-font-liberation 'install-mimetypes
- (lambda* (#:key outputs #:allow-other-keys)
- (install-file "resources/calibre-mimetypes.xml"
- (string-append (assoc-ref outputs "out")
- "/share/mime/packages"))
#t)))))
(home-page "http://calibre-ebook.com/")
(synopsis "E-book library management software")
- 10/23: gnu: calibre: Disable tests that require networking., (continued)
- 10/23: gnu: calibre: Disable tests that require networking., guix-commits, 2019/05/05
- 20/23: gnu: calibre: Delete various junk from source., guix-commits, 2019/05/05
- 15/23: gnu: calibre: Disable sqlite test., guix-commits, 2019/05/05
- 18/23: gnu: calibre: Unbundle python2-odfpy., guix-commits, 2019/05/05
- 21/23: gnu: calibre: Install man pages., guix-commits, 2019/05/05
- 23/23: gnu: calibre: Update to 3.42.0., guix-commits, 2019/05/05
- 19/23: gnu: calibre: Remove libxrender as an input., guix-commits, 2019/05/05
- 01/23: gnu: calibre: Update to 3.41.3., guix-commits, 2019/05/05
- 05/23: gnu: calibre: Move font unbundling to after check phase., guix-commits, 2019/05/05
- 07/23: gnu: calibre: Add python2-html2text as an input., guix-commits, 2019/05/05
- 12/23: gnu: calibre: Use "linux.py" to install desktop files.,
guix-commits <=
- 14/23: gnu: calibre: Disable Qt test., guix-commits, 2019/05/05
- 13/23: gnu: calibre: Disable bs4 test., guix-commits, 2019/05/05
- 09/23: gnu: calibre: Remove unrar test., guix-commits, 2019/05/05
- 11/23: gnu: Add python-soupsieve, python2-soupsieve., guix-commits, 2019/05/05
- 22/23: gnu: calibre: Shorten long line., guix-commits, 2019/05/05