diff --git a/lix/libcmd/markdown.cc b/lix/libcmd/markdown.cc index 7264a9471..8fac6b166 100644 --- a/lix/libcmd/markdown.cc +++ b/lix/libcmd/markdown.cc @@ -8,7 +8,7 @@ namespace nix { -std::string renderMarkdownToTerminal(std::string_view markdown) +std::string renderMarkdownToTerminal(std::string_view markdown, StandardOutputStream fileno) { int windowWidth = getWindowSize().second; @@ -21,7 +21,7 @@ std::string renderMarkdownToTerminal(std::string_view markdown) .feat = LOWDOWN_COMMONMARK | LOWDOWN_FENCED | LOWDOWN_DEFLIST | LOWDOWN_TABLES, .oflags = LOWDOWN_TERM_NOLINK, }; - if (!shouldANSI()) { + if (!shouldANSI(fileno)) { opts.oflags |= LOWDOWN_TERM_NOANSI; } diff --git a/lix/libcmd/markdown.hh b/lix/libcmd/markdown.hh index ac881d335..2588ba189 100644 --- a/lix/libcmd/markdown.hh +++ b/lix/libcmd/markdown.hh @@ -1,10 +1,11 @@ #pragma once ///@file +#include "lix/libutil/terminal.hh" #include "lix/libutil/types.hh" namespace nix { -std::string renderMarkdownToTerminal(std::string_view markdown); +std::string renderMarkdownToTerminal(std::string_view markdown, StandardOutputStream fileno = StandardOutputStream::Stdout); } diff --git a/lix/nix/flake.cc b/lix/nix/flake.cc index 11ae925ca..60ef9306e 100644 --- a/lix/nix/flake.cc +++ b/lix/nix/flake.cc @@ -927,7 +927,7 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand auto welcomeText = cursor->maybeGetAttr(*evalState, "welcomeText"); if (welcomeText) { notice("\n"); - notice(renderMarkdownToTerminal(welcomeText->getString(*evalState))); + notice(renderMarkdownToTerminal(welcomeText->getString(*evalState), StandardOutputStream::Stderr)); } if (!conflictedFiles.empty())