diff options
author | Leo Famulari <leo@famulari.name> | 2017-06-29 18:02:17 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2017-06-29 18:02:17 -0400 |
commit | 1024c8119c71ba3ec0122238e8d8254b08d29187 (patch) | |
tree | ad12a1aac7f828791154a1786d4f245db71b46e9 /gnu/packages/pdf.scm | |
parent | 92cb946bd9d78cb8f6aa8418d505f52da6894ab4 (diff) | |
parent | 95bbaa02aa63bc5eae36f686f1ed9915663aa4cf (diff) | |
download | guix-1024c8119c71ba3ec0122238e8d8254b08d29187.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/pdf.scm')
-rw-r--r-- | gnu/packages/pdf.scm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 5ccaa38eea..dce02a7b57 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -76,6 +76,7 @@ (define-public poppler (package (name "poppler") + (replacement poppler-0.56.0) (version "0.52.0") (source (origin (method url-fetch) @@ -129,15 +130,27 @@ (license license:gpl2+) (home-page "https://poppler.freedesktop.org/"))) -(define-public poppler-qt4 +(define poppler-0.56.0 (package (inherit poppler) + (version "0.56.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://poppler.freedesktop.org/poppler-" + version ".tar.xz")) + (sha256 + (base32 + "0wviayidfv2ix2ql0d4nl9r1ia6qi5kc1nybd9vjx27dk7gvm7c6")))))) + +(define-public poppler-qt4 + (package/inherit poppler (name "poppler-qt4") (inputs `(("qt-4" ,qt-4) ,@(package-inputs poppler))) (synopsis "Qt4 frontend for the Poppler PDF rendering library"))) (define-public poppler-qt5 - (package (inherit poppler) + (package/inherit poppler (name "poppler-qt5") (inputs `(("qtbase" ,qtbase) ,@(package-inputs poppler))) |