aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-09-09 02:12:20 +0200
committerMarius Bakke <marius@gnu.org>2022-09-09 17:03:55 +0200
commitfc398e1a741f0074b6043f8f525b695dd0f071ee (patch)
treed6467d12d67571b9ee059ad9d85994159c25c421
parent8ea970a94512fa8e2fbf457cf13a313af5fb163c (diff)
downloadguix-fc398e1a741f0074b6043f8f525b695dd0f071ee.tar
guix-fc398e1a741f0074b6043f8f525b695dd0f071ee.tar.gz
gnu: QPDF: Fix build with grep 3.8.
This fixes a regression from commit c527b0ce23c5d9228d29c5f90892aa5f05e77347. * gnu/packages/pdf.scm (qpdf)[source](modules, snippet): New fields.
-rw-r--r--gnu/packages/pdf.scm13
1 files changed, 12 insertions, 1 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index cf4d9c872f..09ecd252bc 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -833,7 +833,18 @@ line tools for batch rendering @command{pdfdraw}, rewriting files
"/qpdf-" version ".tar.gz"))
(sha256
(base32
- "049q94rzlcbdr09rvl8xfj3924mk7rfm35x8cg4nisl4lnr27z78"))))
+ "049q94rzlcbdr09rvl8xfj3924mk7rfm35x8cg4nisl4lnr27z78"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; grep 3.8 emits a warning about 'egrep' being deprecated
+ ;; which breaks some tests. Adjust accordingly.
+ ;; Try removing this for QPDF >= 11.
+ (substitute* '("build-scripts/build-doc"
+ "qpdf/qtest/qpdf/diff-encrypted"
+ "qpdf/qtest/qpdf/diff-ignore-ID-version")
+ (("egrep")
+ "grep -E"))))))
(build-system gnu-build-system)
(arguments
(list