diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index ba145b85286f..8bd0691450c7 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -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; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a71bdc01d07..4d384c6dd086 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };