pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #206796 from atorres1985-contrib/labwc

labwc: 0.5.3 -> 0.6.0

authored by Anderson Torres and committed by GitHub a3491c33 632ae113

+16 -11
unified split
+15 -8
pkgs/applications/window-managers/labwc/default.nix
··· 15 15 , scdoc 16 16 , wayland 17 17 , wayland-protocols 18 - , wlroots 18 + , wlroots_0_16 19 + , xcbutilwm 19 20 , xwayland 20 21 }: 21 22 22 - stdenv.mkDerivation rec { 23 + let 24 + wlroots = wlroots_0_16; 25 + in 26 + stdenv.mkDerivation (finalAttrs: { 23 27 pname = "labwc"; 24 - version = "0.5.3"; 28 + version = "0.6.0"; 25 29 26 30 src = fetchFromGitHub { 27 31 owner = "labwc"; 28 - repo = pname; 29 - rev = version; 30 - hash = "sha256-YD2bGxa7uss6KRvOGM0kn8dM+277ubaYeOB7ugRZCcY="; 32 + repo = "labwc"; 33 + rev = finalAttrs.version; 34 + hash = "sha256-P1hKYTW++dpV3kdmI5nBGun080gVTrKzi2WOJKR84j4="; 31 35 }; 32 36 33 37 nativeBuildInputs = [ ··· 49 53 wayland 50 54 wayland-protocols 51 55 wlroots 56 + xcbutilwm 52 57 xwayland 53 58 ]; 54 59 55 - mesonFlags = [ "-Dxwayland=enabled" ]; 60 + mesonFlags = [ 61 + (lib.mesonEnable "xwayland" true) 62 + ]; 56 63 57 64 meta = with lib; { 58 65 homepage = "https://github.com/labwc/labwc"; ··· 61 68 maintainers = with maintainers; [ AndersonTorres ]; 62 69 inherit (wayland.meta) platforms; 63 70 }; 64 - } 71 + })
+1 -3
pkgs/top-level/all-packages.nix
··· 30161 30161 30162 30162 lame = callPackage ../development/libraries/lame { }; 30163 30163 30164 - labwc = callPackage ../applications/window-managers/labwc { 30165 - wlroots = wlroots_0_15; 30166 - }; 30164 + labwc = callPackage ../applications/window-managers/labwc { }; 30167 30165 30168 30166 larswm = callPackage ../applications/window-managers/larswm { }; 30169 30167