diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
| commit | 32787d652460871a79f99b63230f92759e2e0de2 (patch) | |
| tree | ce883cac0d602b10b7c005755d035a08197e73a9 /gnu/packages/pdf.scm | |
| parent | 052939c2f6e36de00a5e756ea29a4cc96884a55d (diff) | |
| parent | c2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff) | |
| download | guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar.gz | |
Merge branch 'master' into staging
Conflicts:
gnu/local.mk
gnu/packages/gdb.scm
gnu/packages/lisp-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/pdf.scm')
| -rw-r--r-- | gnu/packages/pdf.scm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index c9cce98e7f..1442d3e43b 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -191,9 +191,7 @@ please install the @code{flyer-composer-gui} package."))) ;; To build poppler-glib (as needed by Evince), we need Cairo and ;; GLib. But of course, that Cairo must not depend on Poppler. - ("cairo" ,(package (inherit cairo) - (inputs (alist-delete "poppler" - (package-inputs cairo))))))) + ("cairo" ,cairo-sans-poppler))) (propagated-inputs ;; As per poppler-cairo and poppler-glib.pc. ;; XXX: Ideally we'd propagate Cairo too, but that would require a @@ -823,7 +821,7 @@ using a stylus.") (define-public xournalpp (package (name "xournalpp") - (version "1.0.18") + (version "1.0.19") (source (origin (method git-fetch) @@ -832,7 +830,7 @@ using a stylus.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0a9ygbmd4dwgck3k8wsrm2grynqa0adb12wwspzmzvpisbadffjy")))) + (base32 "05nx4cmrka6hwdn7r91yy4h46qpa9k7iy9dkgaq3hrkh9z3fxlkq")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DENABLE_CPPUNIT=ON") ;enable tests |