ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: feh, newsboat: Inline top-level reference to 'curl'.

Browse source 
These references introduced top-level circular dependencies.
Furthermore, they were inaccurate since only CURL_CA_BUNDLE is honored.

* gnu/packages/image-viewers.scm (feh)[native-search-paths]: Remove
top-level reference to 'curl'; inline "CURL_CA_BUNDLE" spec.
* gnu/packages/syndication.scm (newsboat)[native-search-paths]:
Likewise.
This commit is contained in:
Ludovic Courtès 2022-03-18 15:28:47 +01:00
parent 7f9616717f
commit a6de0c4c9c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/image-viewers.scm
View file

@ -287,7 +287,11 @@ (define-public feh
(native-search-paths
;; Feh allows overriding the libcurl builtin CA path (unset in Guix)
;; with the same variable as the `curl` command line HTTP tool.
(package-native-search-paths curl))
(list (search-path-specification
(variable "CURL_CA_BUNDLE")
(file-type 'regular)
(separator #f) ;single entry
(files '("etc/ssl/certs/ca-certificates.crt")))))
(synopsis "Fast and light imlib2-based image viewer")
(description
"feh is an X11 image viewer aimed mostly at console users.

6
gnu/packages/syndication.scm
View file

@ -291,7 +291,11 @@ (define-public newsboat
(assoc-ref gnu:%standard-phases 'install)))))
(native-search-paths
;; Newsboat respects CURL_CA_BUNDLE.
(package-native-search-paths curl))
(list (search-path-specification
(variable "CURL_CA_BUNDLE")
(file-type 'regular)
(separator #f) ;single entry
(files '("etc/ssl/certs/ca-certificates.crt")))))
(home-page "https://newsboat.org/")
(synopsis "Text-mode RSS and Atom feed reader with podcast support")
(description "Newsboat is a feed reader for @dfn{RSS} and @dfn{Atom}, XML