labwc: 0.2.1 -> 0.3.0

This commit is contained in:
AndersonTorres 2021-08-05 06:55:45 -03:00
parent eeb1eb9e28
commit 4d167d07db

View file

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pkg-config , pkg-config
, meson , meson
, ninja , ninja
@ -22,43 +21,34 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "labwc"; pname = "labwc";
version = "0.2.1"; # We're effectively using that version version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "johanmalm"; owner = "johanmalm";
repo = pname; repo = pname;
rev = "6744e103014bcb0480133a029ec0f82f9b017e60"; rev = version;
sha256 = "0sdr4zkix8x3vmna4i946y3whpj7fqizpaac6yj7w0as9d6hj0iq"; sha256 = "sha256-v8LGiQG/n1IXeVMPWyiP9MgZzZLW78JftvxnRVTswaM=";
}; };
patches = [ nativeBuildInputs = [
# To fix the build with wlroots 0.14: meson
(fetchpatch { ninja
# output: access texture width/height directly pkg-config
url = "https://github.com/johanmalm/labwc/commit/892e93dd84c514b4e6f34a0fab01c727edd2d8de.patch"; scdoc
sha256 = "1p1pg1kd98727wlcspa2sffl7ijhvsfad6bj2rxsw322q0bz3yrh";
})
(fetchpatch {
# xdg: chase swaywm/wlroots@9e58301
url = "https://github.com/johanmalm/labwc/commit/874cc9e63706dd54d9f9fcb071f2d2e0c19d3d7e.patch";
sha256 = "0ypd47q5ffq4wjkrcr3068qjknn2s66zszyxg3dl0f87q2pxh6wx";
})
]; ];
nativeBuildInputs = [ pkg-config meson ninja scdoc ];
buildInputs = [ buildInputs = [
cairo cairo
glib glib
libdrm
libinput libinput
libxcb
libxkbcommon
libxml2 libxml2
pango pango
wayland wayland
wayland-protocols wayland-protocols
wlroots wlroots
libxcb
libxkbcommon
xwayland xwayland
libdrm
]; ];
mesonFlags = [ "-Dxwayland=enabled" ]; mesonFlags = [ "-Dxwayland=enabled" ];