From e999a6f576ed0af4cb57302b8f15c4548cf71e93 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 6 Nov 2024 07:46:35 +0100 Subject: [PATCH] ncmpc: build manpage and enable regex --- pkgs/by-name/nc/ncmpc/package.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/nc/ncmpc/package.nix b/pkgs/by-name/nc/ncmpc/package.nix index bc4cc32de26b..97589e6b3ba1 100644 --- a/pkgs/by-name/nc/ncmpc/package.nix +++ b/pkgs/by-name/nc/ncmpc/package.nix @@ -5,18 +5,16 @@ meson, ninja, pkg-config, + sphinx, glib, ncurses, libmpdclient, gettext, boost, fmt, - pcreSupport ? false, - pcre ? null, + pcre2, }: -assert pcreSupport -> pcre != null; - stdenv.mkDerivation rec { pname = "ncmpc"; version = "0.51"; @@ -34,19 +32,25 @@ stdenv.mkDerivation rec { libmpdclient boost fmt - ] ++ lib.optional pcreSupport pcre; + pcre2 + ]; nativeBuildInputs = [ meson ninja pkg-config gettext + sphinx ]; mesonFlags = [ - "-Dlirc=disabled" - "-Ddocumentation=disabled" - ] ++ lib.optional (!pcreSupport) "-Dregex=disabled"; + (lib.mesonEnable "lirc" false) + ]; + + outputs = [ + "out" + "doc" + ]; meta = with lib; { description = "Curses-based interface for MPD (music player daemon)";