From f1953063d59a1b568218b87647f99a5cc4441242 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 4 Mar 2023 21:25:39 +0200 Subject: [PATCH] bemenu: enable strictDeps fixes cross remove useless nulls add scdoc to build man page --- pkgs/applications/misc/bemenu/default.nix | 30 +++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index ced6a70a246..abd2962e138 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,14 +1,10 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, cairo, libxkbcommon -, pango, fribidi, harfbuzz, pcre, pkg-config -, ncursesSupport ? true, ncurses ? null -, waylandSupport ? true, wayland ? null, wayland-protocols ? null -, x11Support ? true, xorg ? null +, pango, fribidi, harfbuzz, pcre, pkg-config, scdoc +, ncursesSupport ? true, ncurses +, waylandSupport ? true, wayland, wayland-protocols, wayland-scanner +, x11Support ? true, xorg }: -assert ncursesSupport -> ncurses != null; -assert waylandSupport -> ! lib.elem null [wayland wayland-protocols]; -assert x11Support -> xorg != null; - stdenv.mkDerivation rec { pname = "bemenu"; version = "0.6.14"; @@ -20,14 +16,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-bMnnuT+LNNKphmvVcD1aaNZxasSGOEcAveC4stCieG8="; }; - nativeBuildInputs = [ pkg-config pcre ]; - - makeFlags = ["PREFIX=$(out)"]; - - buildFlags = ["clients"] - ++ lib.optional ncursesSupport "curses" - ++ lib.optional waylandSupport "wayland" - ++ lib.optional x11Support "x11"; + strictDeps = true; + nativeBuildInputs = [ pkg-config scdoc ] + ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = with lib; [ cairo @@ -42,6 +33,13 @@ stdenv.mkDerivation rec { xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb ]; + makeFlags = ["PREFIX=$(out)"]; + + buildFlags = ["clients"] + ++ lib.optional ncursesSupport "curses" + ++ lib.optional waylandSupport "wayland" + ++ lib.optional x11Support "x11"; + meta = with lib; { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu";