mesa: fix build on Darwin

- remove merged patch
- add new python3.12 dep
This commit is contained in:
K900 2024-07-01 12:33:16 +03:00
parent 0519df43f4
commit 8a0ea7f45b
2 changed files with 1 additions and 24 deletions

View File

@ -18,13 +18,6 @@ let
in stdenv.mkDerivation {
inherit (common) pname version src meta;
patches = [
# Reorder things to make it build on Darwin again
# Submitted upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29592
# FIXME: remove when merged or otherwise addressed
./darwin.patch
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
@ -33,6 +26,7 @@ in stdenv.mkDerivation {
meson
ninja
pkg-config
python3Packages.packaging
python3Packages.python
python3Packages.mako
];

View File

@ -1,17 +0,0 @@
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 8770863eb7c..537f0af112c 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -886,10 +886,11 @@ __glXInitialize(Display * dpy)
Bool zink = False;
Bool try_zink = False;
+ const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE");
+
#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
Bool glx_direct = !debug_get_bool_option("LIBGL_ALWAYS_INDIRECT", false);
Bool glx_accel = !debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false);
- const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE");
zink = env && !strcmp(env, "zink");
try_zink = False;