03/07: gnu: curl: Add a search path for CURL_CA_BUNDLE.

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit dc138d6d69d3f1e0b4f5d22f5be049fe61a99234
Author: Marius Bakke <address@hidden>
Date:   Wed Dec 13 07:09:02 2017 +0100

    gnu: curl: Add a search path for CURL_CA_BUNDLE.
    
    * gnu/packages/curl.scm (curl)[native-search-paths]: New field.
    * gnu/packages/image-viewers.scm (feh)[native-search-paths]: Inherit.
---
 gnu/packages/curl.scm          | 9 +++++++++
 gnu/packages/image-viewers.scm | 6 +-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 2c28f3d..b9d4e7d 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -66,6 +66,15 @@
        ("groff" ,groff)
        ("pkg-config" ,pkg-config)
        ("python" ,python-2)))
+   (native-search-paths
+    ;; Note: This search path is respected by the `curl` command-line tool 
only.
+    ;; Ideally we would bake this into libcurl itself so other users can 
benefit,
+    ;; but it's not supported upstream due to thread safety concerns.
+    (list (search-path-specification
+           (variable "CURL_CA_BUNDLE")
+           (file-type 'regular)
+           (separator #f)                         ;single entry
+           (files '("etc/ssl/certs/ca-certificates.crt")))))
    (arguments
     `(#:configure-flags '("--with-gnutls" "--with-gssapi")
       ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index facf81b..f4eac49 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -83,11 +83,7 @@
     (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.
-     (list (search-path-specification
-            (variable "CURL_CA_BUNDLE")
-            (file-type 'regular)
-            (separator #f)                         ;single entry
-            (files '("etc/ssl/certs/ca-certificates.crt")))))
+     (package-native-search-paths curl))
     (synopsis "Fast and light imlib2-based image viewer")
     (description
       "feh is an X11 image viewer aimed mostly at console users.