mesa: 24.3.4 -> 25.0.0 (#383432)

Author: K900

pkgs/applications/emulators/wine/base.nix

@@ -98,7 +98,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; }
   ++ lib.optionals gtkSupport    [ pkgs.gtk3 pkgs.glib ]
   ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
   ++ lib.optionals tlsSupport    [ pkgs.openssl pkgs.gnutls ]
-  ++ lib.optionals (openglSupport && !stdenv.hostPlatform.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ]
+  ++ lib.optionals (openglSupport && !stdenv.hostPlatform.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.libdrm ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin darwinFrameworks
   ++ lib.optionals (x11Support) (with pkgs.xorg; [
     libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm

pkgs/applications/video/kodi/unwrapped.nix

@@ -18,7 +18,7 @@
 , libcrossguid, libmicrohttpd
 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn2, libpthreadstubs, libtasn1
 , libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson
-, lirc, mesa
+, lirc, mesa-gl-headers
 , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp
 , dbusSupport ? true, dbus
 , joystickSupport ? true, cwiid
@@ -122,7 +122,7 @@ in stdenv.mkDerivation (finalAttrs: {
       bluez giflib glib harfbuzz lcms2 libpthreadstubs
       ffmpeg flatbuffers fstrcmp rapidjson
       lirc
-      mesa # uses eglext_angle.h, which is not provided by glvnd
+      mesa-gl-headers
     ]
     ++ lib.optionals x11Support [
       libX11 xorgproto libXt libXmu libXext.dev libXdmcp

pkgs/by-name/he/hey-mail/package.nix

@@ -21,7 +21,7 @@
   wrapGAppsHook3,
   writeScript,
   atk,
-  mesa,
+  libgbm,
   cups,
   systemd,
   alsa-lib,
@@ -53,7 +53,7 @@ let
     libxkbcommon
     libGL
     atk
-    mesa
+    libgbm
     cups
     systemd
     alsa-lib

pkgs/by-name/ma/magpie/package.nix

@@ -25,14 +25,15 @@
   libXtst,
   libinput,
   libdrm,
+  libgbm,
   gsettings-desktop-schemas,
   glib,
   gtk3,
   gnome-desktop,
   pipewire,
   libgudev,
   libwacom,
-  mesa,
+  mesa-gl-headers,
   meson,
   nix-update-script,
   validatePkgConfig,
@@ -86,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXtst
     libcap_ng
     graphene
-    mesa # actually uses eglmesaext
+    mesa-gl-headers
   ];
 
   nativeBuildInputs = [
@@ -114,6 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     libcanberra
     libdrm
+    libgbm
     libgudev
     libinput
     libstartup_notification

pkgs/by-name/mu/muffin/package.nix

@@ -15,6 +15,7 @@
   json-glib,
   libcanberra,
   libdrm,
+  libgbm,
   libgnomekbd,
   libgudev,
   libinput,
@@ -24,7 +25,7 @@
   libXdamage,
   libxkbcommon,
   libXtst,
-  mesa,
+  mesa-gl-headers,
   meson,
   ninja,
   pipewire,
@@ -84,6 +85,7 @@ stdenv.mkDerivation rec {
     gtk3
     libcanberra
     libdrm
+    libgbm
     libgnomekbd
     libgudev
     libinput
@@ -104,7 +106,7 @@ stdenv.mkDerivation rec {
     json-glib
     libXtst
     graphene
-    mesa # actually uses eglmesaext
+    mesa-gl-headers
   ];
 
   mesonFlags = [

pkgs/by-name/mu/mutter/package.nix

@@ -36,6 +36,7 @@
   libXau,
   libinput,
   libdrm,
+  libgbm,
   libei,
   libdisplay-info,
   gsettings-desktop-schemas,
@@ -50,7 +51,7 @@
   libwacom,
   libSM,
   xwayland,
-  mesa,
+  mesa-gl-headers,
   meson,
   gnome-settings-daemon,
   xorgserver,
@@ -101,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
   propagatedBuildInputs = [
     # required for pkg-config to detect mutter-mtk
     graphene
-    mesa  # actually uses eglmesaext
+    mesa-gl-headers
   ];
 
   nativeBuildInputs = [
@@ -133,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
     harfbuzz
     libcanberra
     libdrm
+    libgbm
     libei
     libdisplay-info
     libGL

pkgs/by-name/mu/mutter46/package.nix

@@ -34,6 +34,7 @@
   libXau,
   libinput,
   libdrm,
+  libgbm,
   libei,
   libdisplay-info,
   gsettings-desktop-schemas,
@@ -48,7 +49,7 @@
   libwacom,
   libSM,
   xwayland,
-  mesa,
+  mesa-gl-headers,
   meson,
   gnome-settings-daemon,
   xorgserver,
@@ -97,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
   propagatedBuildInputs = [
     # required for pkg-config to detect mutter-mtk
     graphene
-    mesa  # actually uses eglmesaext
+    mesa-gl-headers
   ];
 
   nativeBuildInputs = [
@@ -128,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
     harfbuzz
     libcanberra
     libdrm
+    libgbm
     libei
     libdisplay-info
     libgudev

pkgs/by-name/or/orca-slicer/package.nix

@@ -27,7 +27,6 @@
   hicolor-icon-theme,
   ilmbase,
   libpng,
-  mesa,
   mpfr,
   nlopt,
   opencascade-occt_7_6,
@@ -107,9 +106,6 @@ stdenv.mkDerivation rec {
       hicolor-icon-theme
       ilmbase
       libpng
-      mesa
-      mesa.osmesa
-      mesa.drivers
       mpfr
       nlopt
       opencascade-occt_7_6
@@ -129,6 +125,8 @@ stdenv.mkDerivation rec {
     ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
     # Link opencv_core and opencv_imgproc instead of opencv_world
     ./patches/dont-link-opencv-world-orca.patch
+    # Don't link osmesa
+    ./patches/no-osmesa.patch
     # The changeset from https://github.com/SoftFever/OrcaSlicer/pull/7650, can be removed when that PR gets merged
     # Allows disabling the update nag screen
     (fetchpatch {
@@ -169,8 +167,6 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = toString [
     (lib.optionalString withSystemd "-ludev")
-    "-L${mesa.osmesa}/lib"
-    "-L${mesa.drivers}/lib"
     "-L${boost186}/lib"
     "-lboost_log"
     "-lboost_log_setup"
@@ -194,20 +190,16 @@ stdenv.mkDerivation rec {
     "-DBOOST_LOG_NO_LIB=OFF"
     "-DCMAKE_CXX_FLAGS=-DGL_SILENCE_DEPRECATION"
     "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-as-needed"
-    "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${mesa.drivers}/lib -Wl,-rpath,${mesa.osmesa}/lib"
     "-DORCA_VERSION_CHECK_DEFAULT=OFF"
   ];
 
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix LD_LIBRARY_PATH : "$out/lib:${
         lib.makeLibraryPath [
-          mesa.drivers
-          mesa.osmesa
           glew
         ]
       }"
-      --prefix LIBGL_DRIVERS_PATH : "${mesa.drivers}/lib/dri"
       --set WEBKIT_DISABLE_COMPOSITING_MODE 1
     )
   '';

pkgs/by-name/or/orca-slicer/patches/no-osmesa.patch

@@ -0,0 +1,13 @@
+diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
+index e695acd48..174e233e6 100644
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -587,7 +587,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+     FIND_LIBRARY(WAYLAND_EGL_LIBRARIES    NAMES wayland-egl)
+     FIND_LIBRARY(WAYLAND_CLIENT_LIBRARIES NAMES wayland-client)
+     find_package(CURL REQUIRED)
+-    target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES} OSMesa)
++    target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES})
+     target_link_libraries(libslic3r_gui
+         OpenGL::EGL
+         ${WAYLAND_SERVER_LIBRARIES}

pkgs/by-name/qq/qqmusic/package.nix

@@ -21,7 +21,6 @@
   libdbusmenu,
   libglvnd,
   libpulseaudio,
-  mesa,
   nspr,
   nss,
   pango,
@@ -62,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
     libdbusmenu
     libglvnd
     libpulseaudio
-    mesa
     nspr
     nss
     pango