ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 06:06:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: curl: Add a search path for CURL_CA_BUNDLE.

Browse source 
* 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 @@ (define-public curl
("groff" ,groff) ("groff" ,groff)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python-2))) ("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 (arguments
`(#:configure-flags '("--with-gnutls" "--with-gssapi") `(#:configure-flags '("--with-gnutls" "--with-gssapi")
;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl

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

@ -83,11 +83,7 @@ (define-public feh
(native-search-paths (native-search-paths
;; Feh allows overriding the libcurl builtin CA path (unset in Guix) ;; Feh allows overriding the libcurl builtin CA path (unset in Guix)
;; with the same variable as the `curl` command line HTTP tool. ;; with the same variable as the `curl` command line HTTP tool.
(list (search-path-specification (package-native-search-paths curl))
(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") (synopsis "Fast and light imlib2-based image viewer")
(description (description
"feh is an X11 image viewer aimed mostly at console users. "feh is an X11 image viewer aimed mostly at console users.