diff --git a/lix/libcmd/markdown.cc b/lix/libcmd/markdown.cc index 8e4fa94d1..c96287330 100644 --- a/lix/libcmd/markdown.cc +++ b/lix/libcmd/markdown.cc @@ -74,7 +74,11 @@ std::string renderMarkdownToTerminal(std::string_view markdown, StandardOutputSt .vmargin = 0, #endif /* LOWDOWN_SEPARATE_TERM_OPTS */ .feat = LOWDOWN_COMMONMARK | LOWDOWN_FENCED | LOWDOWN_DEFLIST | LOWDOWN_TABLES, +#ifdef LOWDOWN_CONSOLIDATED_OFLAGS + .oflags = LOWDOWN_NOLINK, +#else .oflags = LOWDOWN_TERM_NOLINK, +#endif /* LOWDOWN_CONSOLIDATED_OFLAGS */ }; if (!shouldANSI(fileno)) { opts.oflags |= LOWDOWN_TERM_NOANSI; diff --git a/meson.build b/meson.build index bede78a64..90c216bd8 100644 --- a/meson.build +++ b/meson.build @@ -350,6 +350,11 @@ if lowdown.version().version_compare('>= 1.4.0') add_project_arguments('-DLOWDOWN_SEPARATE_TERM_OPTS', language: 'cpp') endif +# TODO(sterni): drop the corresponding #ifdef after NixOS 25.11 is EOL which still distributes lowdown < 3.0.0 +if lowdown.version().version_compare('>= 3.0.0') + add_project_arguments('-DLOWDOWN_CONSOLIDATED_OFLAGS', language: 'cpp') +endif + # HACK(Qyriad): rapidcheck's pkg-config doesn't include the libs lol # Note: technically we 'check' for rapidcheck twice, for the internal-api-docs handling above, # but Meson will cache the result of the first one, and the required : arguments are different.