diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-11-19 15:01:00 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-11-19 15:01:00 +0100 |
| commit | 2dd12924cf4a30a96262b6d392fcde58c9f10d4b (patch) | |
| tree | 3f74f5426ff214a02b8f6652f6516979657a7f98 /gnu/packages/image-viewers.scm | |
| parent | 259b4f34ba2eaefeafdb7c9f9eb56ee77f16010c (diff) | |
| parent | a93447b89a5b132221072e729d13a3f17391b8c2 (diff) | |
| download | guix-2dd12924cf4a30a96262b6d392fcde58c9f10d4b.tar guix-2dd12924cf4a30a96262b6d392fcde58c9f10d4b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/image-viewers.scm')
| -rw-r--r-- | gnu/packages/image-viewers.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 9e93a97a9b..facf81b087 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages imagemagick) #:use-module (gnu packages maths) #:use-module (gnu packages perl) + #:use-module (gnu packages perl-check) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -55,7 +56,7 @@ (define-public feh (package (name "feh") - (version "2.21") + (version "2.22.2") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -63,7 +64,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j")))) + "1kcflv4jb4250g94nqn28i98xqvvci8w7vqpfr62gxlp16z1za05")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) @@ -79,6 +80,14 @@ ("libxt" ,libxt) ("libx11" ,libx11) ("libxinerama" ,libxinerama))) + (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"))))) (synopsis "Fast and light imlib2-based image viewer") (description "feh is an X11 image viewer aimed mostly at console users. |