diff options
| author | Ivan Nikolaenko <ivan.nikolaenko@unikie.com> | 2022-06-27 12:30:41 +0300 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-07-04 15:30:33 +0000 |
| commit | b0849050570a0aced6c1a8550f56fba12d07b0a9 (patch) | |
| tree | 743579ba90c79e0079ddaef09c6fb009789de138 /pkgs/applications/window-managers/weston | |
| parent | f6c3cd0c8b8c2b5578c6b086285853a8f2181a60 (diff) | |
| download | nixpkgs-b0849050570a0aced6c1a8550f56fba12d07b0a9.tar nixpkgs-b0849050570a0aced6c1a8550f56fba12d07b0a9.tar.gz nixpkgs-b0849050570a0aced6c1a8550f56fba12d07b0a9.tar.bz2 nixpkgs-b0849050570a0aced6c1a8550f56fba12d07b0a9.tar.lz nixpkgs-b0849050570a0aced6c1a8550f56fba12d07b0a9.tar.xz nixpkgs-b0849050570a0aced6c1a8550f56fba12d07b0a9.tar.zst nixpkgs-b0849050570a0aced6c1a8550f56fba12d07b0a9.zip | |
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>
Diffstat (limited to 'pkgs/applications/window-managers/weston')
| -rw-r--r-- | pkgs/applications/window-managers/weston/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 043e2b02a7f..eef1a14639b 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -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 |