diff options
| -rw-r--r-- | gnu-system.am | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/zathura-plugindir-environment-variable.patch | 35 | ||||
| -rw-r--r-- | gnu/packages/pdf.scm | 44 |
3 files changed, 81 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index b9c425ade4..21930cdfb9 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -551,7 +551,8 @@ dist_patch_DATA = \ gnu/packages/patches/xf86-video-trident-remove-mibstore.patch \ gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \ gnu/packages/patches/xfce4-panel-plugins.patch \ - gnu/packages/patches/xmodmap-asprintf.patch + gnu/packages/patches/xmodmap-asprintf.patch \ + gnu/packages/patches/zathura-plugindir-environment-variable.patch MISC_DISTRO_FILES = gnu/packages/javac.in diff --git a/gnu/packages/patches/zathura-plugindir-environment-variable.patch b/gnu/packages/patches/zathura-plugindir-environment-variable.patch new file mode 100644 index 0000000000..2e3ea527d0 --- /dev/null +++ b/gnu/packages/patches/zathura-plugindir-environment-variable.patch @@ -0,0 +1,35 @@ +From ae8e4cc9ab57ff25d2ba6c4b369e8531ce43a6d2 Mon Sep 17 00:00:00 2001 +From: Paul van der Walt <paul@denknerd.org> +Date: Mon, 2 Mar 2015 22:15:39 +0100 +Subject: [PATCH] Search path environment variable for Zathura. + +Adds a search path environment variable for zathura plugins (for reading +different file formats) called ZATHURA_PLUGIN_PATH. Command line option +-p still takes precedence. + +Patch by Paul van der Walt <paul@denknerd.org> +--- + zathura/zathura.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/zathura/zathura.c b/zathura/zathura.c +index 589dd28..375ec54 100644 +--- a/zathura/zathura.c ++++ b/zathura/zathura.c +@@ -413,6 +413,13 @@ zathura_set_plugin_dir(zathura_t* zathura, const char* dir) + g_return_if_fail(zathura != NULL); + g_return_if_fail(zathura->plugins.manager != NULL); + ++ /* Added for Guix: check if environment variable ++ * is set to specify location of zathura plugins. ++ */ ++ ++ if (dir == NULL) ++ dir = g_getenv("ZATHURA_PLUGIN_PATH"); ++ + if (dir != NULL) { + girara_list_t* paths = girara_split_path_array(dir); + GIRARA_LIST_FOREACH(paths, char*, iter, path) +-- +2.3.1 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 7b4f2ab055..d02a954006 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,9 @@ #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages ghostscript) + #:use-module (gnu packages databases) + #:use-module (gnu packages gettext) + #:use-module (gnu packages backup) #:use-module (gnu packages lesstif) #:use-module (gnu packages image) #:use-module (gnu packages pkg-config) @@ -143,6 +147,46 @@ (license license:gpl3) ; or gpl2, but not gpl2+ (home-page "http://www.foolabs.com/xpdf/"))) +(define-public zathura + (package + (name "zathura") + (version "0.3.2") + (source (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura/download/zathura-" + version ".tar.gz")) + (sha256 + (base32 + "1qk5s7cyqp4l673yhma5igk9g24p5jyqyy81fdk7q7xjqlym19px")) + (patches + (list + (search-patch "zathura-plugindir-environment-variable.patch"))))) + (native-inputs `(("pkg-config" ,pkg-config) + ("gettext" ,gnu-gettext))) + (inputs `(("girara" ,girara) + ("sqlite" ,sqlite) + ("gtk+" ,gtk+))) + (native-search-paths + (list (search-path-specification + (variable "ZATHURA_PLUGIN_PATH") + (files '("lib/zathura"))))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + `(,(string-append "PREFIX=" (assoc-ref %outputs "out")) + "CC=gcc" "COLOR=0") + #:tests? #f ; Tests fail: "Gtk cannot open display". + #:test-target "test" + #:phases + (alist-delete 'configure %standard-phases))) + (home-page "https://pwmt.org/projects/zathura/") + (synopsis "Lightweight keyboard-driven PDF viewer") + (description "Zathura is a customizable document viewer. It provides a +minimalistic interface and an interface that mainly focuses on keyboard +interaction.") + (license license:zlib))) + (define-public podofo (package (name "podofo") |