diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-03-18 15:28:47 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-03-18 16:03:34 +0100 |
| commit | a6de0c4c9c3f6642fbf653b1c202a39f53da40e5 (patch) | |
| tree | 0d1d9664d98cf89775f971cc4c195f94bae08857 | |
| parent | 7f9616717ffc75eba7b9278f3f31f10d17529fd3 (diff) | |
| download | guix-a6de0c4c9c3f6642fbf653b1c202a39f53da40e5.tar.gz | |
gnu: feh, newsboat: Inline top-level reference to 'curl'.
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.
| -rw-r--r-- | gnu/packages/image-viewers.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/syndication.scm | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 6c5d70032d..6ab6cf3307 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -287,7 +287,11 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.") (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. diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index cd35b665dc..0417737d7d 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -291,7 +291,11 @@ cards.") (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 |