nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Marius Bakke 2017-12-13 07:09:02 +01:00
parent 2b174b4ebd
commit dc138d6d69
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/curl.scm
View File

@ -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

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

@ -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.