guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: notcurses: Enable building without pandoc.


From: guix-commits
Subject: branch master updated: gnu: notcurses: Enable building without pandoc.
Date: Sat, 03 Jun 2023 15:48:33 -0400

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new bb3454a83f gnu: notcurses: Enable building without pandoc.
bb3454a83f is described below

commit bb3454a83f902d4750e3618e9e23e4ce8f0ca3c6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sat Jun 3 22:10:51 2023 +0300

    gnu: notcurses: Enable building without pandoc.
    
    * gnu/packages/notcurses.scm (notcurses)[arguments]: Adjust
    configure-flags to not use pandoc on systems where pandoc isn't
    supported.
    [native-inputs]: Don't include pandoc on systems where it isn't
    supported.
---
 gnu/packages/notcurses.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/notcurses.scm b/gnu/packages/notcurses.scm
index 591bed23ef..20b2cbb225 100644
--- a/gnu/packages/notcurses.scm
+++ b/gnu/packages/notcurses.scm
@@ -1,5 +1,6 @@
 ;;; Copyright © 2021 Blake Shaw <blake@nonconstructivism.com>
 ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -59,6 +60,10 @@
          "-DUSE_COVERAGE=off"
          ;; Do not build HTML documentation
          "-DUSE_DOXYGEN=off"
+         ;; Unfortunately this disables the manpages.
+         ,@(if (supported-package? pandoc)
+             '()
+             '("-DUSE_PANDOC=off"))
          ;; Don't include mouse support
          "-DUSE_GPM=off"
          ;; Use FFmpeg for multimedia support
@@ -66,9 +71,12 @@
          ;; Follow the Debian Free Software Guidelines, omitting nonfree 
content.
          "-DDFSG_BUILD=ON")))
     (native-inputs
-     (list pkg-config
-           pandoc
-           doctest))
+     (append
+       (list pkg-config)
+       (if (supported-package? pandoc)
+         (list pandoc)
+         '())
+       (list doctest)))
     (inputs
      (list ffmpeg
            libdeflate



reply via email to

[Prev in Thread] Current Thread [Next in Thread]