diff options
| author | Will Dietz <w@wdtz.org> | 2018-07-18 09:41:21 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-07-18 14:34:51 -0500 |
| commit | 06de6dc71b6d676884d0d0baaa7d9f1475c41bce (patch) | |
| tree | 5940a7a1d0d578a9930c2ed6fe9769583b994f64 /pkgs/development/libraries/mesa | |
| parent | c0beb48fa7ca30be0bba228e66b9c1e9064c1742 (diff) | |
| download | nixpkgs-06de6dc71b6d676884d0d0baaa7d9f1475c41bce.tar nixpkgs-06de6dc71b6d676884d0d0baaa7d9f1475c41bce.tar.gz nixpkgs-06de6dc71b6d676884d0d0baaa7d9f1475c41bce.tar.bz2 nixpkgs-06de6dc71b6d676884d0d0baaa7d9f1475c41bce.tar.lz nixpkgs-06de6dc71b6d676884d0d0baaa7d9f1475c41bce.tar.xz nixpkgs-06de6dc71b6d676884d0d0baaa7d9f1475c41bce.tar.zst nixpkgs-06de6dc71b6d676884d0d0baaa7d9f1475c41bce.zip | |
mesa: more include fixes
mostly from void-linux (thanks!)
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/mesa/missing-include.patch | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/mesa/missing-includes.patch | 55 |
3 files changed, 56 insertions, 12 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9c0bf29d490..62a31161d64 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -92,7 +92,7 @@ let self = stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - ./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl + ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ]; outputs = [ "out" "dev" "drivers" "osmesa" ]; diff --git a/pkgs/development/libraries/mesa/missing-include.patch b/pkgs/development/libraries/mesa/missing-include.patch deleted file mode 100644 index dd3e6bb64af..00000000000 --- a/pkgs/development/libraries/mesa/missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig -+++ ./src/gallium/winsys/svga/drm/vmw_screen.h -@@ -34,7 +34,7 @@ - #ifndef VMW_SCREEN_H_ - #define VMW_SCREEN_H_ - -- -+#include <sys/stat.h> - #include "pipe/p_compiler.h" - #include "pipe/p_state.h" - diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch new file mode 100644 index 00000000000..feb6ffe428c --- /dev/null +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -0,0 +1,55 @@ +--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig ++++ ./src/gallium/winsys/svga/drm/vmw_screen.h +@@ -34,7 +34,7 @@ + #ifndef VMW_SCREEN_H_ + #define VMW_SCREEN_H_ + +- ++#include <sys/stat.h> + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + +--- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200 ++++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 +@@ -24,6 +24,8 @@ + #ifndef _THREADPOOL_H_ + #define _THREADPOOL_H_ + ++#include <pthread.h> ++ + #define MAXTHREADS 1 + + struct threadpool { +--- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 ++++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 +@@ -23,7 +23,9 @@ + */ + + #if defined(__linux__) ++#include <sys/types.h> + #include <sys/file.h> ++#include <sys/stat.h> + #include <unistd.h> + #include <fcntl.h> + #else +--- ./src/mesa/drivers/dri/i965/brw_bufmgr.h ++++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h +@@ -37,6 +37,7 @@ + #include <stdbool.h> + #include <stdint.h> + #include <stdio.h> ++#include <time.h> + #include "util/u_atomic.h" + #include "util/list.h" + +--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h ++++ ./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> |