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