Unverified Commit ffe8d1b1 authored by K900's avatar K900 Committed by GitHub
Browse files

mesa: 24.3.4 -> 25.0.0 (#383432)

parents 0ce9de03 ca348247
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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
+2 −2
Original line number Diff line number Diff line
@@ -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
+2 −2
Original line number Diff line number Diff line
@@ -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
+4 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@
  libXtst,
  libinput,
  libdrm,
  libgbm,
  gsettings-desktop-schemas,
  glib,
  gtk3,
@@ -32,7 +33,7 @@
  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
+4 −2
Original line number Diff line number Diff line
@@ -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 = [
Loading