diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-04-15 20:38:05 +0200 |
|---|---|---|
| committer | Servilio Afre Puentes <servilio@gmail.com> | 2021-07-20 01:00:03 -0400 |
| commit | 71e0180f6f6f80b8d94a3b579b91cb8347bc2261 (patch) | |
| tree | cb62cca287615b2aea7e5d164fdf3a25b822e5a8 | |
| parent | mesa: 21.0.1 -> 21.0.3 (diff) | |
| download | nixpkgs-71e0180f6f6f80b8d94a3b579b91cb8347bc2261.tar.gz | |
mesa: 21.0.3 -> 21.1.1
Note: This update likely causes some issues when running an application
that has a direct dependency on Mesa (e.g. Sway and XWayland) and was
compiled against a different Nixpkgs revision. See 7106fca0fe4 for more
details regarding that issue.
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/mesa/missing-includes.patch | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 615777e46dee..2f9f7df04cf0 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.0.3"; + version = "21.1.1"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +45,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0awiyvicvcn3b18x0vx5ik3ly0k3k51ivz2ljj8pnx6ms95nyp2n"; + sha256 = "1lldnf307w6j0d874544f1dinn0gnnp1ds2xph8qjkh5g6imxhpf"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch index 72488893c6b6..c17d54908553 100644 --- a/pkgs/development/libraries/mesa/missing-includes.patch +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -9,14 +9,14 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" ---- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h -+++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h ++++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -28,6 +28,8 @@ #ifndef RADV_AMDGPU_WINSYS_H #define RADV_AMDGPU_WINSYS_H - + +#include <sys/types.h> + - #include "radv_radeon_winsys.h" - #include "ac_gpu_info.h" - #include "addrlib/addrinterface.h"<Paste> + #include <amdgpu.h> + #include <pthread.h> + #include "util/list.h" |