Merge pull request #87594 from mayflower/bemenu-bump

bemenu: 0.3.0 -> 0.4.1
This commit is contained in:
Linus Heckemann 2020-05-11 17:40:07 +02:00 committed by GitHub
commit 2a23ffc124
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,32 +1,33 @@
{ stdenv, fetchFromGitHub, cairo, cmake, libxkbcommon { stdenv, lib, fetchFromGitHub, cairo, libxkbcommon
, pango, fribidi, harfbuzz, pcre, pkgconfig , pango, fribidi, harfbuzz, pcre, pkgconfig
, ncursesSupport ? true, ncurses ? null , ncursesSupport ? true, ncurses ? null
, waylandSupport ? true, wayland ? null , waylandSupport ? true, wayland ? null, wayland-protocols ? null
, x11Support ? true, xlibs ? null, xorg ? null , x11Support ? true, xlibs ? null, xorg ? null
}: }:
assert ncursesSupport -> ncurses != null; assert ncursesSupport -> ncurses != null;
assert waylandSupport -> wayland != null; assert waylandSupport -> ! lib.elem null [wayland wayland-protocols];
assert x11Support -> xlibs != null && xorg != null; assert x11Support -> xlibs != null && xorg != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bemenu"; pname = "bemenu";
version = "0.3.0"; version = "0.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Cloudef"; owner = "Cloudef";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "03k8wijdgj5nwmvgjhsrlh918n719789fhs4dqm23pd00rapxipk"; sha256 = "1fjcs9d3533ay3nz79cx3c0lmy2chgragr2lhsy0xl2ckr0iins0";
}; };
nativeBuildInputs = [ cmake pkgconfig pcre ]; nativeBuildInputs = [ pkgconfig pcre ];
cmakeFlags = [ makeFlags = ["PREFIX=$(out)"];
"-DBEMENU_CURSES_RENDERER=${if ncursesSupport then "ON" else "OFF"}"
"-DBEMENU_WAYLAND_RENDERER=${if waylandSupport then "ON" else "OFF"}" buildFlags = ["clients"]
"-DBEMENU_X11_RENDERER=${if x11Support then "ON" else "OFF"}" ++ lib.optional ncursesSupport "curses"
]; ++ lib.optional waylandSupport "wayland"
++ lib.optional x11Support "x11";
buildInputs = with stdenv.lib; [ buildInputs = with stdenv.lib; [
cairo cairo
@ -34,18 +35,18 @@ stdenv.mkDerivation rec {
harfbuzz harfbuzz
libxkbcommon libxkbcommon
pango pango
] ++ optionals ncursesSupport [ ncurses ] ] ++ optional ncursesSupport ncurses
++ optionals waylandSupport [ wayland ] ++ optionals waylandSupport [ wayland wayland-protocols ]
++ optionals x11Support [ ++ optionals x11Support [
xlibs.libX11 xlibs.libXinerama xlibs.libXft xlibs.libX11 xlibs.libXinerama xlibs.libXft
xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb
]; ];
meta = with stdenv.lib; { meta = with lib; {
homepage = "https://github.com/Cloudef/bemenu"; homepage = "https://github.com/Cloudef/bemenu";
description = "Dynamic menu library and client program inspired by dmenu"; description = "Dynamic menu library and client program inspired by dmenu";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ thiagokokada ]; maintainers = with maintainers; [ lheckemann ];
platforms = with platforms; linux; platforms = with platforms; linux;
}; };
} }