summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-12-13 07:09:02 +0100
committerMarius Bakke <mbakke@fastmail.com>2017-12-13 07:09:02 +0100
commitdc138d6d69d3f1e0b4f5d22f5be049fe61a99234 (patch)
tree2d1b00603dd75e7c0a21d7aba8119f3fef4ba860 /gnu/packages
parent2b174b4ebdccd06d8dd80c634f178f295fb297a8 (diff)
downloadpatches-dc138d6d69d3f1e0b4f5d22f5be049fe61a99234.tar
patches-dc138d6d69d3f1e0b4f5d22f5be049fe61a99234.tar.gz
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/curl.scm9
-rw-r--r--gnu/packages/image-viewers.scm6
2 files changed, 10 insertions, 5 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 2c28f3d28e..b9d4e7d38b 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 facf81b087..f4eac49ea5 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.