guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: guix-commits
Subject: 14/17: gnu: feh, newsboat: Inline top-level reference to 'curl'.
Date: Fri, 18 Mar 2022 11:05:30 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit a6de0c4c9c3f6642fbf653b1c202a39f53da40e5
Author: Ludovic Court├Ęs <ludo@gnu.org>
AuthorDate: Fri Mar 18 15:28:47 2022 +0100

    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.
---
 gnu/packages/image-viewers.scm | 6 +++++-
 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]