Merge pull request #206796 from atorres1985-contrib/labwc

labwc: 0.5.3 -> 0.6.0
This commit is contained in:
Anderson Torres 2022-12-19 02:08:35 -03:00 committed by GitHub
commit a3491c3389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions

View File

@ -15,19 +15,23 @@
, scdoc
, wayland
, wayland-protocols
, wlroots
, wlroots_0_16
, xcbutilwm
, xwayland
}:
stdenv.mkDerivation rec {
let
wlroots = wlroots_0_16;
in
stdenv.mkDerivation (finalAttrs: {
pname = "labwc";
version = "0.5.3";
version = "0.6.0";
src = fetchFromGitHub {
owner = "labwc";
repo = pname;
rev = version;
hash = "sha256-YD2bGxa7uss6KRvOGM0kn8dM+277ubaYeOB7ugRZCcY=";
repo = "labwc";
rev = finalAttrs.version;
hash = "sha256-P1hKYTW++dpV3kdmI5nBGun080gVTrKzi2WOJKR84j4=";
};
nativeBuildInputs = [
@ -49,10 +53,13 @@ stdenv.mkDerivation rec {
wayland
wayland-protocols
wlroots
xcbutilwm
xwayland
];
mesonFlags = [ "-Dxwayland=enabled" ];
mesonFlags = [
(lib.mesonEnable "xwayland" true)
];
meta = with lib; {
homepage = "https://github.com/labwc/labwc";
@ -61,4 +68,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ AndersonTorres ];
inherit (wayland.meta) platforms;
};
}
})

View File

@ -30161,9 +30161,7 @@ with pkgs;
lame = callPackage ../development/libraries/lame { };
labwc = callPackage ../applications/window-managers/labwc {
wlroots = wlroots_0_15;
};
labwc = callPackage ../applications/window-managers/labwc { };
larswm = callPackage ../applications/window-managers/larswm { };