lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

mesa: fix missing timespec_get on aarch64-darwin

This doesn't affect any other target.

See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020

+37
+33
pkgs/development/libraries/mesa/aarch64-darwin.patch
··· 1 + From 8ac29b952e638ec1ea8c3734a3b91253e50c336d Mon Sep 17 00:00:00 2001 2 + From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> 3 + Date: Sun, 24 Jan 2021 21:10:29 -0800 4 + Subject: [PATCH 4/4] Hack to address build failure when using newer macOS SDKs 5 + with older deployment targets 6 + 7 + Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> 8 + --- 9 + include/c11/threads_posix.h | 8 +++++++- 10 + 1 file changed, 7 insertions(+), 1 deletion(-) 11 + 12 + diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h 13 + index 45cb6075e6e..355d725f7da 100644 14 + --- a/include/c11/threads_posix.h 15 + +++ b/include/c11/threads_posix.h 16 + @@ -382,7 +382,13 @@ tss_set(tss_t key, void *val) 17 + 18 + /*-------------------- 7.25.7 Time functions --------------------*/ 19 + // 7.25.6.1 20 + -#ifndef HAVE_TIMESPEC_GET 21 + +#if !defined(HAVE_TIMESPEC_GET) || defined(__APPLE__) 22 + + 23 + +#ifdef __APPLE__ 24 + +#include <time.h> 25 + +#define timespec_get(ts, b) mesa_timespec_get(ts, b) 26 + +#endif 27 + + 28 + static inline int 29 + timespec_get(struct timespec *ts, int base) 30 + { 31 + -- 32 + 2.29.2 (Apple Git-129) 33 +
+4
pkgs/development/libraries/mesa/default.nix
··· 65 65 url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; 66 66 sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; 67 67 }) 68 + ] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ 69 + # Fix aarch64-darwin build, remove when upstreaam supports it out of the box. 70 + # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020 71 + ./aarch64-darwin.patch 68 72 ]; 69 73 70 74 postPatch = ''