From a9f155ad914c4f83a8d4220249d3cbf4fab096ac Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 12:01:58 -0400 Subject: [PATCH 7/7] gnu: Move zathura-cb from pdf.scm to pwmt.scm. * gnu/packages/pdf.scm (zathura-cb): Move to [...] * gnu/packages/pwmt.scm (zathura-cb): [...] here. --- gnu/packages/pdf.scm | 35 ----------------------------------- gnu/packages/pwmt.scm | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6949ca4750..caae864979 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -391,41 +391,6 @@ reading and editing of existing PDF files.") (license license:gpl3) ; or gpl2, but not gpl2+ (home-page "https://www.xpdfreader.com/"))) -(define-public zathura-cb - (package - (name "zathura-cb") - (version "0.1.8") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura-cb/download/zathura-cb-" - version ".tar.xz")) - (sha256 - (base32 - "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5")))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("libarchive" ,libarchive) - ("zathura" ,zathura))) - (build-system meson-build-system) - (arguments - `(#:tests? #f ; package does not contain tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-plugin-directory - ;; Something of a regression in 0.1.8: 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-cb/") - (synopsis "Comic book support for zathura (libarchive backend)") - (description "The zathura-cb plugin adds comic book support to zathura -using libarchive.") - (license license:zlib))) - (define-public podofo (package (name "podofo") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 1662ee6d45..2516c62485 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -24,6 +24,7 @@ (define-module (gnu packages pwmt) #:use-module (gnu packages) + #:use-module (gnu packages backup) #:use-module (gnu packages check) #:use-module (gnu packages djvu) #:use-module (gnu packages documentation) @@ -305,4 +306,39 @@ by using the @code{mupdf} rendering library.") (synopsis "DjVu support for zathura (DjVuLibre backend)") (description "The zathura-djvu plugin adds DjVu support to zathura using the DjVuLibre library.") + (license license:zlib))) + +(define-public zathura-cb + (package + (name "zathura-cb") + (version "0.1.8") + (source (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura-cb/download/zathura-cb-" + version ".tar.xz")) + (sha256 + (base32 + "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5")))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libarchive" ,libarchive) + ("zathura" ,zathura))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; package does not contain tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-plugin-directory + ;; Something of a regression in 0.1.8: 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-cb/") + (synopsis "Comic book support for zathura (libarchive backend)") + (description "The zathura-cb plugin adds comic book support to zathura +using libarchive.") (license license:zlib))) \ No newline at end of file -- 2.26.2