diff options
author | Christoph Neidahl <christoph.neidahl@gmail.com> | 2021-03-28 06:40:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-28 06:40:05 +0200 |
commit | 1dfe690209af14a91b32dbf2f379ca02d050e1a1 (patch) | |
tree | 2c13ad202494cc0b7597f16d690f1e0aedcc2928 /pkgs/development/libraries/egl-wayland | |
parent | eab3dcf262cc256d1945e00cc43b6844a7d895b8 (diff) | |
download | nixpkgs-1dfe690209af14a91b32dbf2f379ca02d050e1a1.tar nixpkgs-1dfe690209af14a91b32dbf2f379ca02d050e1a1.tar.gz nixpkgs-1dfe690209af14a91b32dbf2f379ca02d050e1a1.tar.bz2 nixpkgs-1dfe690209af14a91b32dbf2f379ca02d050e1a1.tar.lz nixpkgs-1dfe690209af14a91b32dbf2f379ca02d050e1a1.tar.xz nixpkgs-1dfe690209af14a91b32dbf2f379ca02d050e1a1.tar.zst nixpkgs-1dfe690209af14a91b32dbf2f379ca02d050e1a1.zip |
egl-wayland: 1.1.4 -> 1.1.6, fix pkg-config file (#111541)
Diffstat (limited to 'pkgs/development/libraries/egl-wayland')
-rw-r--r-- | pkgs/development/libraries/egl-wayland/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/egl-wayland/eglmesaext.patch | 12 |
2 files changed, 9 insertions, 18 deletions
diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index be22e24044d..b3654087ffd 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -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/"; 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 - |