egl-wayland: 1.1.4 -> 1.1.6, fix pkg-config file (#111541)

This commit is contained in:
Christoph Neidahl 2021-03-28 06:40:05 +02:00 committed by GitHub
parent eab3dcf262
commit 1dfe690209
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 18 deletions

View file

@ -40,7 +40,7 @@ let
in stdenv.mkDerivation rec {
pname = "egl-wayland";
version = "1.1.4";
version = "1.1.6";
outputs = [ "out" "dev" ];
@ -48,13 +48,9 @@ in stdenv.mkDerivation rec {
owner = "Nvidia";
repo = pname;
rev = version;
sha256 = "0wvamjcfycd7rgk7v14g2rin55xin9rfkxmivyay3cm08vnl7y1d";
sha256 = "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk";
};
# Add missing include
# https://github.com/NVIDIA/egl-wayland/pull/24
patches = [ ./eglmesaext.patch ];
nativeBuildInputs = [
meson
ninja
@ -69,6 +65,13 @@ in stdenv.mkDerivation rec {
wayland
];
postFixup = ''
# Doubled prefix in pc file after postbuild hook replaces includedir prefix variable with dev output path
substituteInPlace $dev/lib/pkgconfig/wayland-eglstream.pc \
--replace "=$dev/$dev" "=$dev" \
--replace "Requires:" "Requires.private:"
'';
meta = with lib; {
description = "The EGLStream-based Wayland external platform";
homepage = "https://github.com/NVIDIA/egl-wayland/";

View file

@ -1,12 +0,0 @@
diff --git a/src/wayland-eglsurface.c b/src/wayland-eglsurface.c
index 01c9cb3..45736b0 100644
--- a/src/wayland-eglsurface.c
+++ b/src/wayland-eglsurface.c
@@ -37,6 +37,7 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <fcntl.h>
+#include <EGL/eglmesaext.h>
#define WL_EGL_WINDOW_DESTROY_CALLBACK_SINCE 3