diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-12-19 02:08:35 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 02:08:35 -0300 |
| commit | a3491c338992982d011349a354bcd102b89ff1df (patch) | |
| tree | 4be646f1b54305cc64a33f88c572b2a7b9a4b1bb /pkgs | |
| parent | 632ae1130dd8ed8c3d72f16a8a9104987f3864ec (diff) | |
| parent | c92ffdd222ab8c10966c46970b163144228e7fb5 (diff) | |
Merge pull request #206796 from atorres1985-contrib/labwc
labwc: 0.5.3 -> 0.6.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/window-managers/labwc/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index ba145b85286f6..8bd0691450c74 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 5a71bdc01d07f..4d384c6dd086e 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 { }; |