3
0
Fork 0
forked from mirrors/nixpkgs

weston: fix race condition in build system

Some source files have "linux-dmabuf-unstable-v1-server.h" header
included, but do not really need it. Thus, that sources do not
have a correctly configured dependency on that header, which is
dynamically generated during the build.

The fix for that error is to remove unneeded #include.

Signed-off-by: Ivan Nikolaenko <ivan.nikolaenko@unikie.com>
This commit is contained in:
Ivan Nikolaenko 2022-06-27 12:30:41 +03:00 committed by Alyssa Ross
parent f6c3cd0c8b
commit b084905057

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner, python3
{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, wayland-scanner, python3
, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
, colord, lcms2, pipewire ? null
@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
sha256 = "1bj7wnadr7ssn6xw7k8ki0wpj6np3kjd2pcysfz3h0mr290rc8sw";
};
patches = [
# Fix race condition in build system
(fetchpatch {
url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/0d3e438d080433ed5d203c876e7de6c7f8a14f98.patch";
sha256 = "sha256-d9NG1vUIuL4jpXqCo0myz/97JuFYesH+8kJnegQXeMU=";
})
];
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner python3 ];
buildInputs = [
wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm