mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: deluge: Improve package style, simplify.
* gnu/packages/bittorrent.scm (deluge)[native-inputs]: Remove librsvg-for-system. [arguments]: Use Gexp. Simplify removing the check of librsvg. Change-Id: I44862be23f8115bf8c180ef01aef44d1b0e7fa45
This commit is contained in:
parent
aec80de0f3
commit
afd2dabbe5
1 changed files with 14 additions and 30 deletions
|
@ -630,8 +630,7 @@ the following features:
|
||||||
python-twisted
|
python-twisted
|
||||||
python-zope-interface))
|
python-zope-interface))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list intltool python-setuptools python-wheel
|
(list intltool python-setuptools python-wheel))
|
||||||
(librsvg-for-system)))
|
|
||||||
(native-search-paths
|
(native-search-paths
|
||||||
(list $SSL_CERT_DIR
|
(list $SSL_CERT_DIR
|
||||||
$SSL_CERT_FILE))
|
$SSL_CERT_FILE))
|
||||||
|
@ -640,34 +639,19 @@ the following features:
|
||||||
;; started, some of the tests still fail. There are likely some tests
|
;; started, some of the tests still fail. There are likely some tests
|
||||||
;; that require a network connection.
|
;; that require a network connection.
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f
|
(list
|
||||||
#:phases
|
#:tests? #f
|
||||||
(modify-phases %standard-phases
|
#:phases
|
||||||
(add-before 'wrap 'wrap-deluge
|
#~(modify-phases %standard-phases
|
||||||
(lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
|
(add-before 'wrap 'wrap-deluge
|
||||||
(let ((out (assoc-ref outputs "out"))
|
(lambda _
|
||||||
;; "librsvg" input is only needed at build time and it
|
(for-each
|
||||||
;; conflit with the "librsvg" propageted by "gtk+", so we
|
(lambda (program)
|
||||||
;; make sure there is no reference to it in the wrapper.
|
(wrap-program program
|
||||||
(gi-typelib-path
|
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))))
|
||||||
(string-join (filter
|
(map (lambda (name)
|
||||||
(lambda (x) (not (string-prefix?
|
(string-append #$output "/bin/" name))
|
||||||
(assoc-ref
|
(list "deluge" "deluge-gtk"))))))))
|
||||||
(or native-inputs inputs)
|
|
||||||
"librsvg")
|
|
||||||
x)))
|
|
||||||
(string-split
|
|
||||||
(getenv "GI_TYPELIB_PATH")
|
|
||||||
#\:))
|
|
||||||
":")))
|
|
||||||
(for-each
|
|
||||||
(lambda (program)
|
|
||||||
(wrap-program program
|
|
||||||
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
|
|
||||||
(map (lambda (name)
|
|
||||||
(string-append out "/bin/" name))
|
|
||||||
'("deluge" "deluge-gtk"))))
|
|
||||||
#t)))))
|
|
||||||
(home-page "https://www.deluge-torrent.org/")
|
(home-page "https://www.deluge-torrent.org/")
|
||||||
(synopsis "Fully-featured cross-platform BitTorrent client")
|
(synopsis "Fully-featured cross-platform BitTorrent client")
|
||||||
(description
|
(description
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue