diff options
Diffstat (limited to 'pkgs/development/libraries/egl-wayland')
| -rw-r--r-- | pkgs/development/libraries/egl-wayland/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/development/libraries/egl-wayland/eglmesaext.patch | 12 |
2 files changed, 16 insertions, 19 deletions
diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 1509db1b80d..50a74088f2a 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -1,9 +1,10 @@ { lib , stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , meson , ninja +, wayland-scanner , libX11 , mesa , libGL @@ -40,7 +41,7 @@ let in stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.4"; + version = "1.1.7"; outputs = [ "out" "dev" ]; @@ -48,17 +49,18 @@ in stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - sha256 = "0wvamjcfycd7rgk7v14g2rin55xin9rfkxmivyay3cm08vnl7y1d"; + sha256 = "sha256-pqpJ6Uo50BouBU0wGaL21VH5rDiVHKAvJtfzL0YInXU="; }; - # Add missing include - # https://github.com/NVIDIA/egl-wayland/pull/24 - patches = [ ./eglmesaext.patch ]; + depsBuildBuild = [ + pkg-config + ]; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config + wayland-scanner ]; buildInputs = [ @@ -69,6 +71,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/"; diff --git a/pkgs/development/libraries/egl-wayland/eglmesaext.patch b/pkgs/development/libraries/egl-wayland/eglmesaext.patch deleted file mode 100644 index 9384ecff9b0..00000000000 --- a/pkgs/development/libraries/egl-wayland/eglmesaext.patch +++ /dev/null @@ -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 - |