nckx pushed a commit to branch staging in repository guix. commit 0ed990530f08ceb1545a44b523661888f82a29a0 Author: Tobias Geerinckx-Rice <m...@tobias.gr> Date: Mon Mar 19 20:45:22 2018 +0100
gnu: zathura-pdf-poppler: Update to 0.2.9. * gnu/packages/pdf.scm (zathura-pdf-poppler): Update to 0.2.9. [build-system]: Switch to the Meson build system. [arguments]: Trim accordingly. Add a new ‘patch-plugin-directory’ phase. --- gnu/packages/pdf.scm | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6ca1895..048225a 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -460,27 +460,33 @@ by using the @code{mupdf} rendering library.") (define-public zathura-pdf-poppler (package (name "zathura-pdf-poppler") - (version "0.2.8") + (version "0.2.9") (source (origin (method url-fetch) (uri (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-" - version ".tar.gz")) + version ".tar.xz")) (sha256 (base32 - "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2")))) + "1p4jcny0jniygns78mcf0nlm298dszh49qpmjmackrm6dq8hc25y")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("poppler" ,poppler) ("zathura" ,zathura))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments - `(#:make-flags (list (string-append "PREFIX=" %output) - (string-append "PLUGINDIR=" %output "/lib/zathura") - "CC=gcc") - #:tests? #f ; Package does not include tests. + `(#:tests? #f ; package does not include tests #:phases - (modify-phases %standard-phases (delete 'configure)))) + (modify-phases %standard-phases + (add-after 'unpack 'patch-plugin-directory + ;; Something of a regression in 0.2.9: the new Meson build system + ;; now hard-codes an incorrect plugin directory. Fix it. + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "meson.build" + (("(install_dir:).*" _ key) + (string-append key + "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) + #t))))) (home-page "https://pwmt.org/projects/zathura-pdf-poppler/") (synopsis "PDF support for zathura (poppler backend)") (description "The zathura-pdf-poppler plugin adds PDF support to zathura