diff --git a/packaging/hydra.nix b/packaging/hydra.nix index 67e2c0dfd..949c6de8e 100644 --- a/packaging/hydra.nix +++ b/packaging/hydra.nix @@ -176,14 +176,14 @@ rec { # Toggles some settings for better coverage. Windows needs these # library combinations, and Debian build Nix with GNU readline too. - buildReadlineNoMarkdown = + buildReadlineNoLowdown = let components = forAllSystems ( system: nixpkgsFor.${system}.native.nixComponents2.overrideScope ( self: super: { nix-cmd = super.nix-cmd.override { - enableMarkdown = false; + enableLowdown = false; readlineFlavor = "readline"; }; } diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build index f553afa0b..24c1e8a75 100644 --- a/src/libcmd/meson.build +++ b/src/libcmd/meson.build @@ -35,7 +35,7 @@ deps_public += nlohmann_json lowdown = dependency( 'lowdown', version : '>= 0.9.0', - required : get_option('markdown'), + required : get_option('lowdown'), ) deps_private += lowdown configdata.set('HAVE_LOWDOWN', lowdown.found().to_int()) diff --git a/src/libcmd/meson.options b/src/libcmd/meson.options index 31178d82f..c0c206845 100644 --- a/src/libcmd/meson.options +++ b/src/libcmd/meson.options @@ -1,9 +1,9 @@ # vim: filetype=meson option( - 'markdown', + 'lowdown', type : 'feature', - description : 'Enable Markdown rendering in the Nix binary (requires lowdown)', + description : 'Use the \'lowdown\' library to display colored Markdown in the terminal', ) option( diff --git a/src/libcmd/package.nix b/src/libcmd/package.nix index c382f0e57..3ec9c2793 100644 --- a/src/libcmd/package.nix +++ b/src/libcmd/package.nix @@ -19,7 +19,7 @@ version, # Whether to enable Markdown rendering in the Nix binary. - enableMarkdown ? !stdenv.hostPlatform.isWindows, + enableLowdown ? !stdenv.hostPlatform.isWindows, # Which interactive line editor library to use for Nix's repl. # @@ -54,7 +54,7 @@ mkMesonLibrary (finalAttrs: { buildInputs = [ ({ inherit editline readline; }.${readlineFlavor}) ] - ++ lib.optional enableMarkdown lowdown; + ++ lib.optional enableLowdown lowdown; propagatedBuildInputs = [ nix-util @@ -67,7 +67,7 @@ mkMesonLibrary (finalAttrs: { ]; mesonFlags = [ - (lib.mesonEnable "markdown" enableMarkdown) + (lib.mesonEnable "lowdown" enableLowdown) (lib.mesonOption "readline-flavor" readlineFlavor) ];