labwc: 0.6.4 -> 0.6.5

- split output
- strictDeps
- no nested with
- keep an entry in all-packages.nix (because wlroots is too unstable)
This commit is contained in:
Anderson Torres
2023-09-23 16:39:14 -03:00
parent 7bfc02724f
commit a58ad07195

View File

@@ -2,21 +2,23 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, cairo , cairo
, gettext
, glib , glib
, libdrm , libdrm
, libinput , libinput
, libpng
, librsvg
, libxcb , libxcb
, libxkbcommon , libxkbcommon
, libxml2 , libxml2
, gettext
, meson , meson
, ninja , ninja
, pango , pango
, pkg-config , pkg-config
, scdoc , scdoc
, wayland-scanner
, wayland , wayland
, wayland-protocols , wayland-protocols
, wayland-scanner
, wlroots , wlroots
, xcbutilwm , xcbutilwm
, xwayland , xwayland
@@ -24,13 +26,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "labwc"; pname = "labwc";
version = "0.6.4"; version = "0.6.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "labwc"; owner = "labwc";
repo = "labwc"; repo = "labwc";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-8FMC0tq5Gp5qDPUmoJTCrHEergDMUbiTco17jPTJUgE="; hash = "sha256-nQLxE2Q4GiLUjkag/yqctzmkKKWFw1XNFjotE8MMgBA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@@ -47,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
glib glib
libdrm libdrm
libinput libinput
libpng
librsvg
libxcb libxcb
libxkbcommon libxkbcommon
libxml2 libxml2
@@ -58,16 +62,20 @@ stdenv.mkDerivation (finalAttrs: {
xwayland xwayland
]; ];
outputs = [ "out" "man" ];
strictDeps = true;
mesonFlags = [ mesonFlags = [
(lib.mesonEnable "xwayland" true) (lib.mesonEnable "xwayland" true)
]; ];
meta = with lib; { meta = {
homepage = "https://github.com/labwc/labwc"; homepage = "https://github.com/labwc/labwc";
description = "A Wayland stacking compositor, similar to Openbox"; description = "A Wayland stacking compositor, inspired by Openbox";
changelog = "https://raw.githubusercontent.com/labwc/labwc/${finalAttrs.version}/NEWS.md"; changelog = "https://raw.githubusercontent.com/labwc/labwc/${finalAttrs.version}/NEWS.md";
license = licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ]; maintainers = with lib.maintainers; [ AndersonTorres ];
inherit (wayland.meta) platforms; inherit (wayland.meta) platforms;
}; };
}) })