labwc: 0.2.1 -> 0.3.0

+11 -21
+11 -21
pkgs/applications/window-managers/labwc/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , pkg-config 6 5 , meson 7 6 , ninja ··· 22 21 23 22 stdenv.mkDerivation rec { 24 23 pname = "labwc"; 25 - version = "0.2.1"; # We're effectively using that version 24 + version = "0.3.0"; 26 25 27 26 src = fetchFromGitHub { 28 27 owner = "johanmalm"; 29 28 repo = pname; 30 - rev = "6744e103014bcb0480133a029ec0f82f9b017e60"; 31 - sha256 = "0sdr4zkix8x3vmna4i946y3whpj7fqizpaac6yj7w0as9d6hj0iq"; 29 + rev = version; 30 + sha256 = "sha256-v8LGiQG/n1IXeVMPWyiP9MgZzZLW78JftvxnRVTswaM="; 32 31 }; 33 32 34 - patches = [ 35 - # To fix the build with wlroots 0.14: 36 - (fetchpatch { 37 - # output: access texture width/height directly 38 - url = "https://github.com/johanmalm/labwc/commit/892e93dd84c514b4e6f34a0fab01c727edd2d8de.patch"; 39 - sha256 = "1p1pg1kd98727wlcspa2sffl7ijhvsfad6bj2rxsw322q0bz3yrh"; 40 - }) 41 - (fetchpatch { 42 - # xdg: chase swaywm/wlroots@9e58301 43 - url = "https://github.com/johanmalm/labwc/commit/874cc9e63706dd54d9f9fcb071f2d2e0c19d3d7e.patch"; 44 - sha256 = "0ypd47q5ffq4wjkrcr3068qjknn2s66zszyxg3dl0f87q2pxh6wx"; 45 - }) 33 + nativeBuildInputs = [ 34 + meson 35 + ninja 36 + pkg-config 37 + scdoc 46 38 ]; 47 - 48 - nativeBuildInputs = [ pkg-config meson ninja scdoc ]; 49 39 buildInputs = [ 50 40 cairo 51 41 glib 42 + libdrm 52 43 libinput 44 + libxcb 45 + libxkbcommon 53 46 libxml2 54 47 pango 55 48 wayland 56 49 wayland-protocols 57 50 wlroots 58 - libxcb 59 - libxkbcommon 60 51 xwayland 61 - libdrm 62 52 ]; 63 53 64 54 mesonFlags = [ "-Dxwayland=enabled" ];