From d209d800b7df2d4b05ea1266b14a47cba5da129b Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 4 Dec 2024 14:57:48 +0300 Subject: [PATCH] treewide: mesa -> libgbm (where appropriate) This will likely break things, but anything broken should be easily noticeable. --- pkgs/applications/editors/vscode/generic.nix | 4 ++-- pkgs/applications/emulators/wine/base.nix | 2 +- pkgs/applications/graphics/seamly2d/default.nix | 4 ++-- pkgs/applications/misc/1password-gui/linux.nix | 4 ++-- pkgs/applications/misc/lutris/fhsenv.nix | 2 +- pkgs/applications/misc/survex/default.nix | 4 ++-- pkgs/applications/networking/browsers/chromium/common.nix | 8 +++----- pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++-- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- pkgs/applications/networking/dropbox/default.nix | 2 +- .../networking/instant-messengers/discord/linux.nix | 6 +++--- .../networking/instant-messengers/franz/generic.nix | 4 ++-- .../networking/instant-messengers/slack/default.nix | 4 ++-- .../networking/instant-messengers/teamspeak/client5.nix | 4 ++-- .../telegram/telegram-desktop/tg_owt.nix | 6 +++--- .../networking/remote/citrix-workspace/generic.nix | 4 ++-- pkgs/applications/office/morgen/default.nix | 4 ++-- pkgs/applications/office/trilium/desktop.nix | 4 ++-- pkgs/applications/office/wpsoffice/default.nix | 4 ++-- pkgs/applications/video/kodi/unwrapped.nix | 6 +++--- pkgs/applications/video/mpv/default.nix | 4 ++-- pkgs/applications/video/streamlink-twitch-gui/bin.nix | 4 ++-- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- .../hyprwm/xdg-desktop-portal-hyprland/default.nix | 4 ++-- pkgs/applications/window-managers/sommelier/default.nix | 4 ++-- pkgs/build-support/appimage/default.nix | 2 +- pkgs/by-name/ad/adriconf/package.nix | 4 ++-- pkgs/by-name/ae/aether-lv2/package.nix | 4 ++-- pkgs/by-name/al/alfaview/package.nix | 4 ++-- pkgs/by-name/ap/appgate-sdp/package.nix | 4 ++-- pkgs/by-name/aq/aquamarine/package.nix | 4 ++-- pkgs/by-name/ar/arcan/package.nix | 4 ++-- pkgs/by-name/as/asusctl/package.nix | 4 ++-- pkgs/by-name/av/avocode/package.nix | 4 ++-- pkgs/by-name/az/azuredatastudio/package.nix | 4 ++-- pkgs/by-name/bl/bloodhound/package.nix | 4 ++-- pkgs/by-name/bl/bluemail/package.nix | 4 ++-- pkgs/by-name/bl/blur-effect/package.nix | 4 ++-- pkgs/by-name/br/brave/make-brave.nix | 4 ++-- pkgs/by-name/br/brlcad/package.nix | 4 ++-- pkgs/by-name/bu/budgie-desktop/package.nix | 4 ++-- pkgs/by-name/bu/burpsuite/package.nix | 2 +- pkgs/by-name/ca/cardboard/package.nix | 4 ++-- pkgs/by-name/ci/cinnamon-common/package.nix | 4 ++-- pkgs/by-name/cl/clipqr/package.nix | 4 ++-- pkgs/by-name/co/cosmic-comp/package.nix | 4 ++-- pkgs/by-name/co/cosmic-edit/package.nix | 4 ++-- pkgs/by-name/co/cosmic-workspaces-epoch/package.nix | 4 ++-- pkgs/by-name/dy/dyalog/package.nix | 4 ++-- pkgs/by-name/el/electron-fiddle/package.nix | 2 +- pkgs/by-name/en/enpass/package.nix | 2 +- pkgs/by-name/en/envision/package.nix | 2 +- pkgs/by-name/eu/eudic/package.nix | 4 ++-- pkgs/by-name/ex/exodus/package.nix | 4 ++-- pkgs/by-name/fb/fbida/package.nix | 4 ++-- pkgs/by-name/fe/feishu/package.nix | 6 +++--- pkgs/by-name/fi/figma-linux/package.nix | 2 +- pkgs/by-name/fi/firefoxpwa/package.nix | 4 ++-- pkgs/by-name/fl/fluffychat/package.nix | 4 ++-- pkgs/by-name/fo/forge/package.nix | 4 ++-- pkgs/by-name/gi/github-desktop/package.nix | 4 ++-- pkgs/by-name/gi/gitkraken/package.nix | 4 ++-- pkgs/by-name/gl/glmark2/package.nix | 4 ++-- pkgs/by-name/gn/gnome-shell/package.nix | 4 ++-- pkgs/by-name/go/google-chrome/package.nix | 4 ++-- pkgs/by-name/hy/hyper/package.nix | 4 ++-- pkgs/by-name/hy/hyprland/package.nix | 4 ++-- pkgs/by-name/hy/hyprlock/package.nix | 4 ++-- pkgs/by-name/im/immersed/linux.nix | 2 +- pkgs/by-name/ja/jay/package.nix | 4 ++-- pkgs/by-name/jo/jogl/package.nix | 4 ++-- pkgs/by-name/ke/keeweb/package.nix | 4 ++-- pkgs/by-name/km/kmscon/package.nix | 4 ++-- pkgs/by-name/li/linux-wallpaperengine/package.nix | 4 ++-- pkgs/by-name/lo/louvre/package.nix | 4 ++-- pkgs/by-name/ma/magpie/package.nix | 4 ++-- pkgs/by-name/ma/mailspring/linux.nix | 4 ++-- pkgs/by-name/md/mdk-sdk/package.nix | 4 ++-- pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++-- pkgs/by-name/mi/miracle-wm/package.nix | 4 ++-- pkgs/by-name/mi/mission-center/package.nix | 4 ++-- pkgs/by-name/mo/mongodb-compass/package.nix | 4 ++-- pkgs/by-name/mu/muffin/package.nix | 4 ++-- pkgs/by-name/mu/mullvad-browser/package.nix | 4 ++-- pkgs/by-name/mu/mullvad-vpn/package.nix | 4 ++-- pkgs/by-name/mu/multiviewer-for-f1/package.nix | 4 ++-- pkgs/by-name/mu/mutter/package.nix | 4 ++-- pkgs/by-name/mu/mutter43/package.nix | 4 ++-- pkgs/by-name/ne/neatvnc/package.nix | 4 ++-- pkgs/by-name/ni/niri/package.nix | 4 ++-- pkgs/by-name/on/onlyoffice-desktopeditors/package.nix | 4 ++-- pkgs/by-name/op/opera/package.nix | 4 ++-- pkgs/by-name/pi/pioneer/package.nix | 4 ++-- pkgs/by-name/pl/plasticity/package.nix | 4 ++-- pkgs/by-name/po/polar-bookshelf/package.nix | 4 ++-- pkgs/by-name/po/positron-bin/package.nix | 4 ++-- pkgs/by-name/po/postman/linux.nix | 4 ++-- pkgs/by-name/pr/premid/package.nix | 6 +++--- pkgs/by-name/pu/publii/package.nix | 4 ++-- pkgs/by-name/pu/pulsar/package.nix | 4 ++-- pkgs/by-name/qq/qq/package.nix | 4 ++-- pkgs/by-name/ra/raylib/package.nix | 4 ++-- pkgs/by-name/re/react-native-debugger/package.nix | 4 ++-- pkgs/by-name/re/retroarch-bare/package.nix | 4 ++-- pkgs/by-name/ro/roam-research/linux.nix | 4 ++-- pkgs/by-name/ro/rocketchat-desktop/package.nix | 2 +- pkgs/by-name/sc/scenefx/package.nix | 4 ++-- pkgs/by-name/sh/shadps4/package.nix | 4 ++-- pkgs/by-name/si/sidequest/package.nix | 4 ++-- pkgs/by-name/si/signal-desktop/generic.nix | 4 ++-- pkgs/by-name/sk/skia-aseprite/package.nix | 4 ++-- pkgs/by-name/sk/skypeforlinux/package.nix | 4 ++-- pkgs/by-name/sn/snapmaker-luban/package.nix | 4 ++-- pkgs/by-name/sn/sndpeek/package.nix | 4 ++-- pkgs/by-name/sp/spotify/linux.nix | 4 ++-- pkgs/by-name/sr/srm-cuarzo/package.nix | 4 ++-- pkgs/by-name/st/stardust-xr-server/package.nix | 4 ++-- pkgs/by-name/st/staruml/package.nix | 4 ++-- pkgs/by-name/st/steam/package.nix | 2 +- pkgs/by-name/st/stm32cubemx/package.nix | 2 +- pkgs/by-name/st/stone-phaser/package.nix | 4 ++-- pkgs/by-name/st/stress-ng/package.nix | 4 ++-- pkgs/by-name/ta/tana/package.nix | 4 ++-- pkgs/by-name/te/termius/package.nix | 4 ++-- pkgs/by-name/te/tetrd/package.nix | 4 ++-- pkgs/by-name/th/thedesk/package.nix | 4 ++-- pkgs/by-name/ti/ticktick/package.nix | 4 ++-- pkgs/by-name/ti/tidal-hifi/package.nix | 4 ++-- pkgs/by-name/to/tonelib-metal/package.nix | 4 ++-- pkgs/by-name/to/tonelib-noisereducer/package.nix | 4 ++-- pkgs/by-name/to/tor-browser/package.nix | 4 ++-- pkgs/by-name/tr/tradingview/package.nix | 4 ++-- pkgs/by-name/ty/typora/package.nix | 4 ++-- pkgs/by-name/um/umr/package.nix | 4 ++-- pkgs/by-name/up/upwork/package.nix | 4 ++-- pkgs/by-name/vi/viber/package.nix | 4 ++-- pkgs/by-name/vi/virglrenderer/package.nix | 4 ++-- pkgs/by-name/vk/vkmark/package.nix | 4 ++-- pkgs/by-name/wa/waffle/package.nix | 8 ++++---- pkgs/by-name/wa/wavebox/package.nix | 4 ++-- pkgs/by-name/wa/waveterm/package.nix | 4 ++-- pkgs/by-name/wa/waypipe/package.nix | 4 ++-- pkgs/by-name/wa/wayvnc/package.nix | 4 ++-- pkgs/by-name/we/webex/package.nix | 4 ++-- pkgs/by-name/we/wechat-uos/package.nix | 4 ++-- pkgs/by-name/we/weston/package.nix | 4 ++-- pkgs/by-name/wf/wf-recorder/package.nix | 4 ++-- pkgs/by-name/wi/wio/package.nix | 4 ++-- pkgs/by-name/wi/wire-desktop/package.nix | 4 ++-- pkgs/by-name/wl/wlvncc/package.nix | 4 ++-- pkgs/by-name/xa/xarcan/package.nix | 4 ++-- pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix | 4 ++-- pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix | 4 ++-- pkgs/by-name/xe/xemu/package.nix | 4 ++-- pkgs/by-name/ya/yandex-browser/package.nix | 4 ++-- pkgs/by-name/ye/yesplaymusic/package.nix | 4 ++-- pkgs/by-name/za/zaz/package.nix | 4 ++-- pkgs/by-name/zo/zoom-us/package.nix | 4 ++-- pkgs/by-name/zo/zotero-beta/package.nix | 4 ++-- pkgs/by-name/zo/zotero/linux.nix | 4 ++-- pkgs/desktops/deepin/core/deepin-kwin/default.nix | 4 ++-- pkgs/desktops/enlightenment/efl/default.nix | 4 ++-- pkgs/desktops/plasma-5/kpipewire.nix | 4 ++-- pkgs/desktops/plasma-5/kwin/default.nix | 4 ++-- pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix | 4 ++-- pkgs/development/compilers/halide/default.nix | 4 ++-- pkgs/development/compilers/jetbrains-jdk/17.nix | 4 ++-- pkgs/development/compilers/jetbrains-jdk/default.nix | 4 ++-- pkgs/development/compilers/jetbrains-jdk/jcef.nix | 4 ++-- pkgs/development/cuda-modules/cuda/overrides.nix | 6 +++--- pkgs/development/libraries/SDL2/default.nix | 5 +++-- pkgs/development/libraries/cogl/default.nix | 4 ++-- pkgs/development/libraries/libcef/default.nix | 4 ++-- pkgs/development/libraries/libdevil/default.nix | 4 ++-- pkgs/development/libraries/librealsense/default.nix | 4 ++-- .../libraries/qt-6/modules/qtwebengine/default.nix | 4 ++-- pkgs/development/libraries/qwlroots/default.nix | 4 ++-- pkgs/development/libraries/wlroots/default.nix | 4 ++-- pkgs/development/python-modules/wxpython/4.2.nix | 4 ++-- pkgs/development/tools/electron/binary/generic.nix | 4 ++-- pkgs/development/tools/nwjs/default.nix | 4 ++-- pkgs/development/tools/unityhub/default.nix | 2 +- pkgs/development/web/cypress/default.nix | 4 ++-- pkgs/development/web/playwright/webkit.nix | 4 ++-- pkgs/kde/plasma/kpipewire/default.nix | 4 ++-- pkgs/kde/plasma/kwin/default.nix | 4 ++-- pkgs/os-specific/linux/anbox/default.nix | 4 ++-- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +- pkgs/servers/mir/common.nix | 4 ++-- pkgs/servers/sunshine/default.nix | 6 +++--- pkgs/servers/x11/xorg/default.nix | 8 ++++---- pkgs/servers/x11/xorg/xwayland.nix | 4 ++-- pkgs/tools/security/keybase/gui.nix | 4 ++-- pkgs/top-level/python-packages.nix | 1 - 194 files changed, 384 insertions(+), 386 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index fbe7658d8e4d..7f2736135dcf 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -10,7 +10,7 @@ , at-spi2-atk , autoPatchelfHook , alsa-lib -, mesa +, libgbm , nss , nspr , xorg @@ -159,7 +159,7 @@ in ]; buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ alsa-lib at-spi2-atk libkrb5 libgbm nss nspr systemd xorg.libxkbfile ]; runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index a5f45b2e13e7..c47a04e9e42c 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -105,7 +105,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } ]) ++ lib.optionals waylandSupport (with pkgs; [ wayland wayland-scanner libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev - mesa # for libgbm + libgbm ]))); inherit patches; diff --git a/pkgs/applications/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix index b25c9b6dacfe..42e440692e80 100644 --- a/pkgs/applications/graphics/seamly2d/default.nix +++ b/pkgs/applications/graphics/seamly2d/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, qtbase, wrapQtAppsHook, fetchFromGitHub, - addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, xvfb-run, + addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, libgbm, xvfb-run, fontconfig, freetype, xorg, qmake, python3, qttools, git }: let @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { poppler_utils qtxmlpatterns qtsvg - mesa + libgbm freetype xorg.libXi xorg.libXrender diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 925c3d9137ff..9998860829a8 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -30,7 +30,7 @@ libxshmfence, libGL, libappindicator-gtk3, - mesa, + libgbm, nspr, nss, pango, @@ -94,7 +94,7 @@ stdenv.mkDerivation { libxshmfence libGL libappindicator-gtk3 - mesa + libgbm nspr nss pango diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 5aa8f2ca3813..1d6aecc39a9b 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -61,7 +61,7 @@ in buildFHSEnv { # Higan // TODO: "higan is not available for the x86_64 architecture" # Libretro - fluidsynth hidapi mesa libdrm + fluidsynth hidapi libgbm libdrm # MAME fontconfig SDL2_ttf diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index f5ce17ea21f7..fcf950c1b054 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -9,7 +9,7 @@ , libGLU , libICE , libX11 -, mesa +, libgbm , perl , pkg-config , proj @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # TODO: libGLU doesn't build for macOS because of Mesa issues # (#233265); is it required for anything? libGLU - mesa + libgbm libICE libX11 ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4a16de319a1e..3c8fd7971359 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -37,7 +37,7 @@ , bison, gperf, libkrb5 , glib, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL -, mesa +, libgbm , pciutils, protobuf, speechd-minimal, libXdamage, at-spi2-core , pipewire , libva @@ -246,8 +246,7 @@ let util-linux alsa-lib libkrb5 glib gtk3 dbus-glib - libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL - mesa # required for libgbm + libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL libgbm pciutils protobuf speechd-minimal libXdamage at-spi2-core pipewire libva @@ -274,8 +273,7 @@ let util-linux alsa-lib libkrb5 glib gtk3 dbus-glib - libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL - mesa # required for libgbm + libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL libgbm pciutils protobuf speechd-minimal libXdamage at-spi2-core pipewire libva diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index f34bfdb6fc0f..d10f9aa2c5db 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -12,7 +12,7 @@ , udev , libkrb5 , libva -, mesa # firefox wants gbm for drm+dmabuf +, libgbm , cups , pciutils , vulkan-loader @@ -87,7 +87,7 @@ let ); libs = lib.optionals stdenv.hostPlatform.isLinux ( - [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ] + [ udev libva libgbm libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ] ++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal ) ++ lib.optional pipewireSupport pipewire diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 0571fc2d5784..a3811723a4e8 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -6,7 +6,7 @@ , libxml2 , glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core , qt5 -, libdrm, mesa +, libdrm, libgbm , vulkan-loader , nss, nspr , patchelf, makeWrapper @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { qt5.qtbase freetype fontconfig libXrender libuuid expat glib nss nspr libGL libxml2 pango cairo - libdrm mesa vulkan-loader + libdrm libgbm vulkan-loader wayland pipewire ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs ++ lib.optional pulseSupport libpulseaudio diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 58f55f0b9c15..ec2d4709031c 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -46,7 +46,7 @@ buildFHSEnv { libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender libXxf86vm libGL libxcb xkeyboardconfig curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt - procps zlib mesa libxshmfence libpthreadstubs libappindicator + procps zlib libgbm libxshmfence libpthreadstubs libappindicator ]; extraInstallCommands = '' diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 6afa1f058935..a0870e86efcd 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -43,7 +43,7 @@ libXtst, libxcb, libxshmfence, - mesa, + libgbm, nspr, nss, pango, @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { libXtst libxcb libxshmfence - mesa + libgbm nss wrapGAppsHook3 makeShellWrapper @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { systemd libpulseaudio libdrm - mesa + libgbm stdenv.cc.cc alsa-lib atk diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 807e96332de0..d14c0431323d 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -22,7 +22,7 @@ , udev , libnotify , xdg-utils -, mesa +, libgbm , libglvnd , libappindicator-gtk3 }: @@ -52,7 +52,7 @@ in stdenv.mkDerivation (rec { libXtst libXScrnSaver ]) ++ [ - mesa #libgbm + libgbm gtk3 atk glib diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 46ef41e1ddd6..3592c3783fdc 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -28,7 +28,7 @@ , libxcb , libxkbcommon , libxshmfence -, mesa +, libgbm , nspr , nss , pango @@ -117,7 +117,7 @@ let libuuid libxcb libxkbcommon - mesa + libgbm nspr nss pango diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix index c66c765a5038..5799d1d8b410 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix @@ -19,7 +19,7 @@ , libnotify , libpulseaudio , libxkbcommon -, mesa +, libgbm , nss , udev , xorg @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { libnotify libpulseaudio libxkbcommon - mesa + libgbm nss xorg.libX11 xorg.libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index a0cf6de02363..60f4a0128ab8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -24,7 +24,7 @@ glib, abseil-cpp, pipewire, - mesa, + libgbm, libdrm, libGL, apple-sdk_15, @@ -47,7 +47,7 @@ stdenv.mkDerivation { substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \ --replace-fail '"libGL.so.1"' '"${lib.getLib libGL}/lib/libGL.so.1"' \ - --replace-fail '"libgbm.so.1"' '"${lib.getLib mesa}/lib/libgbm.so.1"' \ + --replace-fail '"libgbm.so.1"' '"${lib.getLib libgbm}/lib/libgbm.so.1"' \ --replace-fail '"libdrm.so.2"' '"${lib.getLib libdrm}/lib/libdrm.so.2"' ''; @@ -85,7 +85,7 @@ stdenv.mkDerivation { libXi glib pipewire - mesa + libgbm libdrm libGL ] diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 015a723d116a..cc934d925531 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,7 +1,7 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 -, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 +, gnome2, libgbm, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 , libfaketime @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { libvorbis libxml2 llvmPackages_12.libunwind - mesa + libgbm nspr nss opencv4' diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 9e8adcd27044..738c03321013 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, asar, alsa-lib, gtk3, libxshmfence, mesa, nss }: +, asar, alsa-lib, gtk3, libxshmfence, libgbm, nss }: stdenv.mkDerivation rec { pname = "morgen"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { asar ]; - buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; + buildInputs = [ alsa-lib gtk3 libxshmfence libgbm nss ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 13a291f45804..1f1fe85fa044 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -1,6 +1,6 @@ { stdenv, lib, unzip, autoPatchelfHook , fetchurl, makeWrapper -, alsa-lib, mesa, nss, nspr, systemd +, alsa-lib, libgbm, nss, nspr, systemd , makeDesktopItem, copyDesktopItems, wrapGAppsHook3 , metaCommon }: @@ -35,7 +35,7 @@ let buildInputs = [ alsa-lib - mesa + libgbm nss nspr stdenv.cc.cc diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 81d6e299bb6b..808e9a87407d 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -7,7 +7,7 @@ , libtool , libxkbcommon , nspr -, mesa +, libgbm , libtiff , udev , gtk3 @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { libjpeg libxkbcommon nspr - mesa + libgbm libtiff udev gtk3 diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 116f01837bc8..7b25b05fae44 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/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 +, lirc, mesa , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp , dbusSupport ? true, dbus , joystickSupport ? true, cwiid @@ -33,7 +33,7 @@ , vdpauSupport ? true, libvdpau , waylandSupport ? false, wayland, wayland-protocols , waylandpp ? null, libxkbcommon -, gbmSupport ? false, mesa, libinput, libdisplay-info +, gbmSupport ? false, libgbm, libinput, libdisplay-info , buildPackages }: @@ -151,7 +151,7 @@ in stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals gbmSupport [ libxkbcommon.dev - mesa.dev + libgbm libinput.dev libdisplay-info ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index e66f19778605..ffdfb193bd41 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -39,7 +39,7 @@ libxkbcommon, lua, makeWrapper, - mesa, + libgbm, meson, mujs, ninja, @@ -187,7 +187,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals cmsSupport [ lcms2 ] ++ lib.optionals drmSupport [ libdrm - mesa + libgbm ] ++ lib.optionals dvdnavSupport [ libdvdnav diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index ac1490345c29..1e149f75006f 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -20,7 +20,7 @@ , gtk3-x11 , libudev0-shim , libuuid -, mesa +, libgbm , nss , nspr , xorg @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { glib pango gtk3-x11 - mesa + libgbm nss nspr libuuid diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 396b10250ed7..30eb30a1c1c4 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -22,7 +22,7 @@ , xenSupport ? false, xen , cephSupport ? false, ceph , glusterfsSupport ? false, glusterfs, libuuid -, openGLSupport ? sdlSupport, mesa, libepoxy, libdrm +, openGLSupport ? sdlSupport, libgbm, libepoxy, libdrm , rutabagaSupport ? openGLSupport && !minimal && lib.meta.availableOn stdenv.hostPlatform rutabaga_gfx, rutabaga_gfx , virglSupport ? openGLSupport, virglrenderer , libiscsiSupport ? !minimal, libiscsi @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals xenSupport [ xen ] ++ lib.optionals cephSupport [ ceph ] ++ lib.optionals glusterfsSupport [ glusterfs libuuid ] - ++ lib.optionals openGLSupport [ mesa libepoxy libdrm ] + ++ lib.optionals openGLSupport [ libgbm libepoxy libdrm ] ++ lib.optionals rutabagaSupport [ rutabaga_gfx ] ++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals libiscsiSupport [ libiscsi ] diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index e46b2e677acd..b71b4c9a901d 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -13,7 +13,7 @@ hyprutils, hyprwayland-scanner, libdrm, - mesa, + libgbm, pipewire, qtbase, qttools, @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { hyprlang hyprutils libdrm - mesa + libgbm pipewire qtbase qttools diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix index 99c6892ba3da..04b9290f050a 100644 --- a/pkgs/applications/window-managers/sommelier/default.nix +++ b/pkgs/applications/window-managers/sommelier/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip , meson, ninja, pkg-config, python3, python3Packages, wayland-scanner -, libxkbcommon, mesa, pixman, xorg, wayland, gtest +, libxkbcommon, libgbm, pixman, xorg, wayland, gtest }: stdenv.mkDerivation { @@ -17,7 +17,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ meson ninja pkg-config python3 python3Packages.jinja2 wayland-scanner ]; - buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ]; + buildInputs = [ libxkbcommon libgbm pixman wayland xorg.libxcb ]; preConfigure = '' patchShebangs gen-shim.py diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 92a43ddec257..df662f265104 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -160,7 +160,7 @@ rec { libidn tbb wayland - mesa + libgbm libxkbcommon vulkan-loader diff --git a/pkgs/by-name/ad/adriconf/package.nix b/pkgs/by-name/ad/adriconf/package.nix index fae7c99b8a81..ea752029c1ef 100644 --- a/pkgs/by-name/ad/adriconf/package.nix +++ b/pkgs/by-name/ad/adriconf/package.nix @@ -9,7 +9,7 @@ , pcre , gtkmm4 , pugixml -, mesa +, libgbm , pciutils }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libdrm libGL atkmm pcre gtkmm4 pugixml mesa pciutils ]; + buildInputs = [ libdrm libGL atkmm pcre gtkmm4 pugixml libgbm pciutils ]; cmakeFlags = [ "-DENABLE_UNIT_TESTS=off" ]; diff --git a/pkgs/by-name/ae/aether-lv2/package.nix b/pkgs/by-name/ae/aether-lv2/package.nix index afec5763022d..21f7f8a0dbae 100644 --- a/pkgs/by-name/ae/aether-lv2/package.nix +++ b/pkgs/by-name/ae/aether-lv2/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, lv2, libX11, libGL, libGLU, mesa, cmake }: +{ lib, stdenv, fetchFromGitHub, lv2, libX11, libGL, libGLU, libgbm, cmake }: stdenv.mkDerivation rec { pname = "aether-lv2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - lv2 libX11 libGL libGLU mesa + lv2 libX11 libGL libGLU libgbm ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix index b0e15b532842..e4aac994865c 100644 --- a/pkgs/by-name/al/alfaview/package.nix +++ b/pkgs/by-name/al/alfaview/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper, wrapGAppsHook3 , alsa-lib, dbus, fontconfig, freetype, glib, gst_all_1, libGL , libinput, libpulseaudio, libsecret, libtiff, libxkbcommon -, mesa, openssl, systemd, xorg }: +, libgbm, openssl, systemd, xorg }: stdenv.mkDerivation rec { pname = "alfaview"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libsecret libtiff libxkbcommon - mesa + libgbm openssl stdenv.cc.cc systemd diff --git a/pkgs/by-name/ap/appgate-sdp/package.nix b/pkgs/by-name/ap/appgate-sdp/package.nix index bd0b9283c54b..c0378258d77a 100644 --- a/pkgs/by-name/ap/appgate-sdp/package.nix +++ b/pkgs/by-name/ap/appgate-sdp/package.nix @@ -25,7 +25,7 @@ , libxkbcommon , lttng-ust , makeWrapper -, mesa +, libgbm , networkmanager , nspr , nss @@ -61,7 +61,7 @@ let libxcb libxkbcommon lttng-ust - mesa + libgbm nspr nss openssl diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index 716dc590cbbe..369355a72cd1 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -11,7 +11,7 @@ libffi, libGL, libinput, - mesa, + libgbm, nix-update-script, pixman, pkg-config, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { libffi libGL libinput - mesa + libgbm pixman seatd udev diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix index 5259b5560cfb..ea097d3865c4 100644 --- a/pkgs/by-name/ar/arcan/package.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -29,7 +29,7 @@ libxcb, libxkbcommon, makeWrapper, - mesa, + libgbm, mupdf, openal, openjpeg, @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { libvncserver libxcb libxkbcommon - mesa + libgbm mupdf openal openjpeg diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index ab160092f156..221499a70afe 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -9,7 +9,7 @@ , libGL , libinput , libxkbcommon -, mesa +, libgbm , seatd , wayland }: @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { libGL libinput libxkbcommon - mesa + libgbm seatd systemd wayland diff --git a/pkgs/by-name/av/avocode/package.nix b/pkgs/by-name/av/avocode/package.nix index 0878d91bba8a..16d4b5892526 100644 --- a/pkgs/by-name/av/avocode/package.nix +++ b/pkgs/by-name/av/avocode/package.nix @@ -1,6 +1,6 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip , gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, adwaita-icon-theme -, xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon +, xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, libgbm, libxkbcommon }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libXScrnSaver libuuid libdrm - mesa + libgbm ]); desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/az/azuredatastudio/package.nix b/pkgs/by-name/az/azuredatastudio/package.nix index 62ddf238f703..dbe5423e8ccf 100644 --- a/pkgs/by-name/az/azuredatastudio/package.nix +++ b/pkgs/by-name/az/azuredatastudio/package.nix @@ -21,7 +21,7 @@ , libunwind , libuuid , libxkbcommon -, mesa +, libgbm , nspr , nss , openssl @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { gdk-pixbuf glib gtk3 - mesa + libgbm nss nspr libdrm diff --git a/pkgs/by-name/bl/bloodhound/package.nix b/pkgs/by-name/bl/bloodhound/package.nix index f4e67ecacf12..d1ca7b5f3eb8 100644 --- a/pkgs/by-name/bl/bloodhound/package.nix +++ b/pkgs/by-name/bl/bloodhound/package.nix @@ -24,7 +24,7 @@ , libxcb , libxkbcommon , libxshmfence -, mesa +, libgbm , nspr , nss , pango @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { libuuid libxcb libxkbcommon - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/bl/bluemail/package.nix b/pkgs/by-name/bl/bluemail/package.nix index 40d861faaf5c..e8150526360d 100644 --- a/pkgs/by-name/bl/bluemail/package.nix +++ b/pkgs/by-name/bl/bluemail/package.nix @@ -10,7 +10,7 @@ , nss , libXdamage , libdrm -, mesa +, libgbm , libxshmfence , makeDesktopItem , makeWrapper @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { nss libXdamage libdrm - mesa + libgbm libxshmfence udev ]; diff --git a/pkgs/by-name/bl/blur-effect/package.nix b/pkgs/by-name/bl/blur-effect/package.nix index cc88bb088949..7bdfb8f212ca 100644 --- a/pkgs/by-name/bl/blur-effect/package.nix +++ b/pkgs/by-name/bl/blur-effect/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gdk-pixbuf, libGL, mesa }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gdk-pixbuf, libGL, libgbm }: stdenv.mkDerivation rec { pname = "blur-effect"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf libGL - mesa + libgbm ]; meta = with lib; { diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 0321d609efff..74a6e7b9817e 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -37,7 +37,7 @@ libuuid, libxkbcommon, libxshmfence, - mesa, + libgbm, nspr, nss, pango, @@ -125,7 +125,7 @@ let libxshmfence libXtst libuuid - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/br/brlcad/package.nix b/pkgs/by-name/br/brlcad/package.nix index 031b15baf0ba..2f8fb6e3fd04 100644 --- a/pkgs/by-name/br/brlcad/package.nix +++ b/pkgs/by-name/br/brlcad/package.nix @@ -7,7 +7,7 @@ , libX11 , libXi , freetype -, mesa +, libgbm }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { libX11 libXi freetype - mesa + libgbm ]; cmakeFlags = [ diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 74d9d2c35a94..c2c42bc63de3 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -24,7 +24,7 @@ libuuid, libwnck, magpie, - mesa, + libgbm, meson, mutter, ninja, @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { libuuid libwnck magpie - mesa + libgbm polkit sassc upower diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index c0354bdc8303..79ee03944a83 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -72,7 +72,7 @@ buildFHSEnv { libdrm udev libxkbcommon - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/ca/cardboard/package.nix b/pkgs/by-name/ca/cardboard/package.nix index e8bc82fd1cf0..8932ff738706 100644 --- a/pkgs/by-name/ca/cardboard/package.nix +++ b/pkgs/by-name/ca/cardboard/package.nix @@ -12,7 +12,7 @@ , libpng , libxcb , libxkbcommon -, mesa +, libgbm , meson , ninja , pandoc @@ -93,7 +93,7 @@ stdenv.mkDerivation { libpng libxcb libxkbcommon - mesa + libgbm pixman wayland wayland-protocols diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index 1f9410611301..0c0d726406c3 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon-common/package.nix @@ -23,7 +23,7 @@ , libstartup_notification , libXtst , libXdamage -, mesa +, libgbm , muffin , networkmanager , pkg-config @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { libstartup_notification libXtst libXdamage - mesa + libgbm muffin networkmanager polkit diff --git a/pkgs/by-name/cl/clipqr/package.nix b/pkgs/by-name/cl/clipqr/package.nix index 90d4e0b66b52..ae790e262400 100644 --- a/pkgs/by-name/cl/clipqr/package.nix +++ b/pkgs/by-name/cl/clipqr/package.nix @@ -11,7 +11,7 @@ , libXrandr , libXxf86vm , makeDesktopItem -, mesa +, libgbm , pkg-config , stdenv }: @@ -40,7 +40,7 @@ buildGoModule rec { libXinerama libXrandr libXxf86vm - mesa + libgbm ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 065a0f4b006f..9178572f1616 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -8,7 +8,7 @@ , libinput , libglvnd , libxkbcommon -, mesa +, libgbm , seatd , udev , xwayland @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { libglvnd libinput libxkbcommon - mesa + libgbm pixman seatd udev diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index cd4d2aa7ac81..67f85ab3ca86 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -12,7 +12,7 @@ libinput, fontconfig, freetype, - mesa, + libgbm, wayland, xorg, vulkan-loader, @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { libglvnd fontconfig freetype - mesa + libgbm wayland vulkan-loader ]; diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 7e7e53306a41..dab360fa9766 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -5,7 +5,7 @@ , libxkbcommon , libinput , libglvnd -, mesa +, libgbm , udev , wayland }: @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxkbcommon libinput libglvnd mesa udev wayland ]; + buildInputs = [ libxkbcommon libinput libglvnd libgbm udev wayland ]; postInstall = '' mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 310ec6a8bc34..73f28dcc3cc6 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -17,7 +17,7 @@ , gtk3 , libdrm , libGL -, mesa +, libgbm , nss , htmlRendererSupport ? false @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 libdrm libGL - mesa + libgbm nss ] ++ lib.optional sqaplSupport unixODBC; diff --git a/pkgs/by-name/el/electron-fiddle/package.nix b/pkgs/by-name/el/electron-fiddle/package.nix index cde2dcae311c..8bd5dd17eb38 100644 --- a/pkgs/by-name/el/electron-fiddle/package.nix +++ b/pkgs/by-name/el/electron-fiddle/package.nix @@ -126,7 +126,7 @@ buildFHSEnv { libdrm libnotify libxkbcommon - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/en/enpass/package.nix b/pkgs/by-name/en/enpass/package.nix index 20582a6d5c6b..a02bd0c6012d 100644 --- a/pkgs/by-name/en/enpass/package.nix +++ b/pkgs/by-name/en/enpass/package.nix @@ -2,7 +2,7 @@ , glib, libGLU, libGL, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk3, pango , makeWrapper , python3Packages, lib, libcap -, lsof, curl, libuuid, cups, mesa, xz, libxkbcommon +, lsof, curl, libuuid, cups, libgbm, xz, libxkbcommon }: let diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix index 72aa327ac0c0..18dbd47926c6 100644 --- a/pkgs/by-name/en/envision/package.nix +++ b/pkgs/by-name/en/envision/package.nix @@ -34,7 +34,7 @@ buildFHSEnv { ++ pkgs.monado.nativeBuildInputs ++ (with pkgs; [ # Additional dependencies required by Monado when built using Envision - mesa + libgbm shaderc xorg.libX11 xorg.libxcb diff --git a/pkgs/by-name/eu/eudic/package.nix b/pkgs/by-name/eu/eudic/package.nix index 5b2f144e2c0d..65a4a434e9ff 100644 --- a/pkgs/by-name/eu/eudic/package.nix +++ b/pkgs/by-name/eu/eudic/package.nix @@ -21,7 +21,7 @@ , nss , libgpg-error , libjack2 -, mesa +, libgbm }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { nss libgpg-error libjack2 - mesa + libgbm ]; unpackPhase = '' diff --git a/pkgs/by-name/ex/exodus/package.nix b/pkgs/by-name/ex/exodus/package.nix index 09759bb7e5ff..dfff9b53b6ae 100644 --- a/pkgs/by-name/ex/exodus/package.nix +++ b/pkgs/by-name/ex/exodus/package.nix @@ -23,7 +23,7 @@ libpulseaudio, at-spi2-core, libxkbcommon, - mesa, + libgbm, }: stdenv.mkDerivation (finalAttrs: { @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { systemd vivaldi-ffmpeg-codecs libxkbcommon - mesa + libgbm ]; in '' diff --git a/pkgs/by-name/fb/fbida/package.nix b/pkgs/by-name/fb/fbida/package.nix index 79e66d8ed988..e2622ead4dba 100644 --- a/pkgs/by-name/fb/fbida/package.nix +++ b/pkgs/by-name/fb/fbida/package.nix @@ -20,7 +20,7 @@ , libepoxy , pixman , poppler -, mesa +, libgbm , lirc }: @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { pixman poppler lirc - mesa + libgbm ]; makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ]; diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix index 8a0dc4256a03..4ca723b5f3d2 100644 --- a/pkgs/by-name/fe/feishu/package.nix +++ b/pkgs/by-name/fe/feishu/package.nix @@ -45,7 +45,7 @@ , libxkbfile , libxshmfence , makeShellWrapper -, mesa +, libgbm , nspr , nss , pango @@ -117,7 +117,7 @@ let libxkbcommon libxkbfile libxshmfence - mesa + libgbm nspr nss pango @@ -155,7 +155,7 @@ stdenv.mkDerivation { libgcrypt libpulseaudio libxshmfence - mesa + libgbm nspr nss ]; diff --git a/pkgs/by-name/fi/figma-linux/package.nix b/pkgs/by-name/fi/figma-linux/package.nix index 2b11d1680398..68bd2cb482c1 100644 --- a/pkgs/by-name/fi/figma-linux/package.nix +++ b/pkgs/by-name/fi/figma-linux/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 libdrm libxkbcommon - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index d669709c228d..83a0fb0da460 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -15,7 +15,7 @@ libnotify, libpulseaudio, libva, - mesa, + libgbm, nixosTests, openssl, pciutils, @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec { libnotify libpulseaudio libva - mesa + libgbm pciutils pipewire udev diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix index fdf26abced85..79e4f694df00 100644 --- a/pkgs/by-name/fl/fluffychat/package.nix +++ b/pkgs/by-name/fl/fluffychat/package.nix @@ -2,7 +2,7 @@ , fetchzip , fetchFromGitHub , imagemagick -, mesa +, libgbm , libdrm , flutter324 , pulseaudio @@ -14,7 +14,7 @@ }: let - libwebrtcRpath = lib.makeLibraryPath [ mesa libdrm ]; + libwebrtcRpath = lib.makeLibraryPath [ libgbm libdrm ]; pubspecLock = lib.importJSON ./pubspec.lock.json; in flutter324.buildFlutterApplication (rec { diff --git a/pkgs/by-name/fo/forge/package.nix b/pkgs/by-name/fo/forge/package.nix index 051038c74787..f7d8c5977f4e 100644 --- a/pkgs/by-name/fo/forge/package.nix +++ b/pkgs/by-name/fo/forge/package.nix @@ -10,7 +10,7 @@ , lib , libGLU , libGL -, mesa +, libgbm , opencl-clhpp , pkg-config , stdenv @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { libGLU opencl-clhpp SDL2 - mesa + libgbm ]; meta = with lib; { diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index 455147398429..7b517fcb4224 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -13,7 +13,7 @@ , libdrm , alsa-lib , cups -, mesa +, libgbm , systemd , openssl , libglvnd @@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { libdrm alsa-lib cups - mesa + libgbm openssl ]; diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index c27d97233522..5e52145944e5 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -44,7 +44,7 @@ e2fsprogs, krb5, libdrm, - mesa, + libgbm, unzip, copyDesktopItems, libxshmfence, @@ -145,7 +145,7 @@ let e2fsprogs krb5 libdrm - mesa + libgbm libxshmfence libxkbcommon libGL diff --git a/pkgs/by-name/gl/glmark2/package.nix b/pkgs/by-name/gl/glmark2/package.nix index cbfdeb22fbcc..3fc9261e2397 100644 --- a/pkgs/by-name/gl/glmark2/package.nix +++ b/pkgs/by-name/gl/glmark2/package.nix @@ -14,7 +14,7 @@ , udev , wayland , wayland-protocols -, mesa +, libgbm }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { udev wayland wayland-protocols - mesa + libgbm ]; mesonFlags = [ "-Dflavors=drm-gl,drm-glesv2,gbm-gl,gbm-glesv2,wayland-gl,wayland-glesv2,x11-gl,x11-gl-egl,x11-glesv2" ]; diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index fca04ba81d4c..9105061ac28d 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -58,7 +58,7 @@ gnome-autoar, gnome-tecla, bash-completion, - mesa, + libgbm, libGL, libXi, libX11, @@ -155,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: { ibus gnome-desktop gnome-settings-daemon - mesa + libgbm libGL # for egl, required by mutter-clutter libXi # required by libmutter libX11 diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 264895de9a7a..9ee43d84994f 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -39,7 +39,7 @@ libXScrnSaver, libxshmfence, libXtst, - mesa, + libgbm, nspr, nss, pango, @@ -142,7 +142,7 @@ let libXScrnSaver libxshmfence libXtst - mesa + libgbm nspr nss opusWithCustomModes diff --git a/pkgs/by-name/hy/hyper/package.nix b/pkgs/by-name/hy/hyper/package.nix index 9f46b59d6a53..fed02445d27c 100644 --- a/pkgs/by-name/hy/hyper/package.nix +++ b/pkgs/by-name/hy/hyper/package.nix @@ -2,14 +2,14 @@ , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver, libxcb, nss, nspr , alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk, at-spi2-core, libxshmfence -, libdrm, libxkbcommon, mesa, nixosTests}: +, libdrm, libxkbcommon, libgbm, nixosTests}: let libPath = lib.makeLibraryPath [ stdenv.cc.cc gtk3 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver nss nspr alsa-lib cups expat udev libpulseaudio - at-spi2-atk at-spi2-core libxshmfence libdrm libxkbcommon mesa + at-spi2-atk at-spi2-core libxshmfence libdrm libxkbcommon libgbm ]; in diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index d144b31b1031..d004724f947c 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -23,7 +23,7 @@ libinput, libuuid, libxkbcommon, - mesa, + libgbm, pango, pciutils, pkgconf, @@ -145,7 +145,7 @@ customStdenv.mkDerivation (finalAttrs: { libinput libuuid libxkbcommon - mesa + libgbm pango pciutils tomlplusplus diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 7a744ea14456..4b5e8c87b028 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -20,7 +20,7 @@ libwebp, pango, libdrm, - mesa, + libgbm, nix-update-script, }: @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { libjpeg libwebp libxkbcommon - mesa + libgbm pam pango sdbus-cpp_2 diff --git a/pkgs/by-name/im/immersed/linux.nix b/pkgs/by-name/im/immersed/linux.nix index 0447090c8231..13b8a1fc4152 100644 --- a/pkgs/by-name/im/immersed/linux.nix +++ b/pkgs/by-name/im/immersed/linux.nix @@ -28,7 +28,7 @@ appimageTools.wrapAppImage rec { libgpg-error fontconfig libGL - mesa + libgbm wayland pipewire fribidi diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index 9eff972a0c60..e17c67f4c6a3 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -4,7 +4,7 @@ , libGL , libinput , libxkbcommon -, mesa +, libgbm , pango , udev , shaderc @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libGL libxkbcommon - mesa + libgbm pango udev libinput diff --git a/pkgs/by-name/jo/jogl/package.nix b/pkgs/by-name/jo/jogl/package.nix index d8a626ee15c0..1a16dadc7c6e 100644 --- a/pkgs/by-name/jo/jogl/package.nix +++ b/pkgs/by-name/jo/jogl/package.nix @@ -9,7 +9,7 @@ , xcbuild , udev , xorg -, mesa +, libgbm , darwin , coreutils }: @@ -80,7 +80,7 @@ stdenv.mkDerivation { xorg.libXt xorg.libXxf86vm xorg.libXrender - mesa + libgbm ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.Cocoa diff --git a/pkgs/by-name/ke/keeweb/package.nix b/pkgs/by-name/ke/keeweb/package.nix index 2a16f765c6ef..5cea9880f834 100644 --- a/pkgs/by-name/ke/keeweb/package.nix +++ b/pkgs/by-name/ke/keeweb/package.nix @@ -13,7 +13,7 @@ nss, udev, gnome-keyring, - mesa, + libgbm, gtk3, libusb1, libsecret, @@ -63,7 +63,7 @@ let libXtst libxshmfence gnome-keyring - mesa + libgbm gtk3 libusb1 libsecret diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix index 18ac0370b855..f48609c2eef4 100644 --- a/pkgs/by-name/km/kmscon/package.nix +++ b/pkgs/by-name/km/kmscon/package.nix @@ -14,7 +14,7 @@ , pkg-config , docbook_xsl , libxslt -, mesa +, libgbm , ninja , buildPackages }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { pango pixman systemd - mesa + libgbm ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix index 0fb3165c1eeb..6fcd9aca09e4 100644 --- a/pkgs/by-name/li/linux-wallpaperengine/package.nix +++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix @@ -41,7 +41,7 @@ libXcomposite, libXdamage, libXfixes, - mesa, + libgbm, gtk3, pango, cairo, @@ -73,7 +73,7 @@ let libXext libXfixes libXrandr - mesa + libgbm gtk3 pango cairo diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 1852a7dc3990..532eb826a2c7 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -12,7 +12,7 @@ , libX11 , libXcursor , libxkbcommon -, mesa +, libgbm , pixman , seatd , srm-cuarzo @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { libX11 libXcursor libxkbcommon - mesa + libgbm pixman seatd srm-cuarzo diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix index 9fcc3ff2bfe9..b5893def7984 100644 --- a/pkgs/by-name/ma/magpie/package.nix +++ b/pkgs/by-name/ma/magpie/package.nix @@ -32,7 +32,7 @@ pipewire, libgudev, libwacom, - mesa, + libgbm, meson, nix-update-script, validatePkgConfig, @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils gettext libxcvt - mesa # needed for gbm + libgbm meson ninja xvfb-run diff --git a/pkgs/by-name/ma/mailspring/linux.nix b/pkgs/by-name/ma/mailspring/linux.nix index 47fe6697f48e..eb3d8fb5993a 100644 --- a/pkgs/by-name/ma/mailspring/linux.nix +++ b/pkgs/by-name/ma/mailspring/linux.nix @@ -18,7 +18,7 @@ , openssl , udev , xorg -, mesa +, libgbm , libdrm , libappindicator }: @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXScrnSaver xorg.libXtst xorg.libxshmfence - mesa + libgbm libdrm ]; diff --git a/pkgs/by-name/md/mdk-sdk/package.nix b/pkgs/by-name/md/mdk-sdk/package.nix index ae41f07525a6..e1b77c42ed98 100644 --- a/pkgs/by-name/md/mdk-sdk/package.nix +++ b/pkgs/by-name/md/mdk-sdk/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoPatchelfHook -, alsa-lib, gcc-unwrapped, libX11, libcxx, libdrm, libglvnd, libpulseaudio, libxcb, mesa, wayland, xz, zlib +, alsa-lib, gcc-unwrapped, libX11, libcxx, libdrm, libglvnd, libpulseaudio, libxcb, libgbm, wayland, xz, zlib , libva, libvdpau, addDriverRunpath }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ - alsa-lib gcc-unwrapped libX11 libcxx libdrm libglvnd libpulseaudio libxcb mesa wayland xz zlib + alsa-lib gcc-unwrapped libX11 libcxx libdrm libglvnd libpulseaudio libxcb libgbm wayland xz zlib ]; appendRunpaths = lib.makeLibraryPath [ diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index cd3af906cb1b..74f45528220b 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -38,7 +38,7 @@ libXScrnSaver, libxshmfence, libXtst, - mesa, + libgbm, nspr, nss, pango, @@ -142,7 +142,7 @@ let libXScrnSaver libxshmfence libXtst - mesa + libgbm nspr nss opusWithCustomModes diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 5b2e897ae7e3..1a10ffd23d0c 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -16,7 +16,7 @@ libnotify, libuuid, libxkbcommon, - mesa, + libgbm, mir, nlohmann_json, pcre2, @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { libnotify libuuid libxkbcommon - mesa # gbm.h + libgbm mir nlohmann_json pcre2 diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix index 9d6594b2c0f5..4949b4ea5e38 100644 --- a/pkgs/by-name/mi/mission-center/package.nix +++ b/pkgs/by-name/mi/mission-center/package.nix @@ -31,7 +31,7 @@ libGL, libadwaita, libdrm, - mesa, + libgbm, pango, sqlite, udev, @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { libGL libadwaita libdrm - mesa + libgbm pango sqlite udev diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index acca4f247448..e088d5e6f312 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -23,7 +23,7 @@ libuuid, libxcb, libxkbcommon, - mesa, + libgbm, nspr, nss, pango, @@ -58,7 +58,7 @@ let libuuid libxcb libxkbcommon - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix index a95834b04c25..93fe738e3f1d 100644 --- a/pkgs/by-name/mu/muffin/package.nix +++ b/pkgs/by-name/mu/muffin/package.nix @@ -23,7 +23,7 @@ , libXdamage , libxkbcommon , libXtst -, mesa +, libgbm , meson , ninja , pipewire @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - mesa # needed for gbm + libgbm meson ninja pkg-config diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index f71782ea36b5..d70d83706644 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -25,7 +25,7 @@ , libXrender , libXt , libXtst -, mesa +, libgbm , pango , pciutils , zlib @@ -77,7 +77,7 @@ let libXrender libXt libXtst - mesa # for libgbm + libgbm pango pciutils stdenv.cc.cc diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index c97925b2a71b..62d4bbc1e961 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -17,7 +17,7 @@ nspr, nss, gtk3, - mesa, + libgbm, libGL, wayland, xorg, @@ -48,7 +48,7 @@ let gtk3 libappindicator libnotify - mesa + libgbm xorg.libX11 xorg.libXScrnSaver xorg.libXcomposite diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix index 408dc0530e17..d86d4993ff24 100644 --- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix +++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix @@ -16,7 +16,7 @@ , libdrm , libudev0-shim , libxkbcommon -, mesa +, libgbm , nspr , nss , pango @@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation rec { gtk3 libdrm libxkbcommon - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index ea00dd2b3fd2..c22ffc3b1e30 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -50,7 +50,7 @@ libwacom, libSM, xwayland, - mesa, + libgbm, meson, gnome-settings-daemon, xorgserver, @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils gettext libxcvt - mesa # needed for gbm + libgbm meson ninja xvfb-run diff --git a/pkgs/by-name/mu/mutter43/package.nix b/pkgs/by-name/mu/mutter43/package.nix index bea00d83f794..0f3345e92f70 100644 --- a/pkgs/by-name/mu/mutter43/package.nix +++ b/pkgs/by-name/mu/mutter43/package.nix @@ -32,7 +32,7 @@ libgudev, libwacom, xwayland, - mesa, + libgbm, meson, gnome-settings-daemon, xorgserver, @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils gettext libxcvt - mesa # needed for gbm + libgbm meson ninja xvfb-run diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix index 29f2186ec54c..cd58500e7487 100644 --- a/pkgs/by-name/ne/neatvnc/package.nix +++ b/pkgs/by-name/ne/neatvnc/package.nix @@ -8,7 +8,7 @@ , ffmpeg , gnutls , libjpeg_turbo -, mesa +, libgbm , pixman , zlib }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ffmpeg gnutls libjpeg_turbo - mesa + libgbm pixman zlib ]; diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index ed501fb5c604..1658151fbe6b 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -7,7 +7,7 @@ libglvnd, libinput, libxkbcommon, - mesa, + libgbm, nix-update-script, pango, pipewire, @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { libglvnd # For libEGL libinput libxkbcommon - mesa # For libgbm + libgbm pango seatd wayland # For libwayland-client diff --git a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix index 565661df3d54..a5aeebf9e1da 100644 --- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix +++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix @@ -26,7 +26,7 @@ libudev0-shim, libdrm, makeWrapper, - mesa, + libgbm, noto-fonts-cjk-sans, nspr, nss, @@ -99,7 +99,7 @@ let libdrm nspr nss - mesa # libgbm + libgbm qt5.qtbase qt5.qtdeclarative qt5.qtsvg diff --git a/pkgs/by-name/op/opera/package.nix b/pkgs/by-name/op/opera/package.nix index c2ca46cf3373..afa2405b5a34 100644 --- a/pkgs/by-name/op/opera/package.nix +++ b/pkgs/by-name/op/opera/package.nix @@ -31,7 +31,7 @@ , libpulseaudio , libuuid , libxshmfence -, mesa +, libgbm , nspr , nss , pango @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { libuuid libxcb libxshmfence - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix index 57518f084bc3..d3fdacf0da99 100644 --- a/pkgs/by-name/pi/pioneer/package.nix +++ b/pkgs/by-name/pi/pioneer/package.nix @@ -13,7 +13,7 @@ , libsigcxx , libvorbis , lua5_2 -, mesa +, libgbm , SDL2 , SDL2_image }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libsigcxx libvorbis lua5_2 - mesa + libgbm SDL2 SDL2_image ]; diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index cc17a083f913..9e28792f6d39 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -17,7 +17,7 @@ , libnotify , libsForQt5 , libxkbcommon -, mesa +, libgbm , nspr , nss , openssl @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; - nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook rpmextract mesa ]; + nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook rpmextract libgbm ]; buildInputs = [ alsa-lib diff --git a/pkgs/by-name/po/polar-bookshelf/package.nix b/pkgs/by-name/po/polar-bookshelf/package.nix index 955b45784e92..b0bedc4cc645 100644 --- a/pkgs/by-name/po/polar-bookshelf/package.nix +++ b/pkgs/by-name/po/polar-bookshelf/package.nix @@ -38,7 +38,7 @@ , libnghttp2 , gsettings-desktop-schemas , libdrm -, mesa +, libgbm }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm - mesa + libgbm gsettings-desktop-schemas glib gtk3 diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index f99fa66da7f3..2e8143793bfc 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -11,7 +11,7 @@ libglvnd, libxkbcommon, makeShellWrapper, - mesa, + libgbm, musl, nss, patchelf, @@ -44,7 +44,7 @@ stdenv.mkDerivation { gtk3 libglvnd libxkbcommon - mesa + libgbm musl nss stdenv.cc.cc diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index fe15275bfb7d..6cc76b638ee8 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -36,7 +36,7 @@ , libXScrnSaver , libxkbcommon , libdrm -, mesa +, libgbm # It's unknown which version of openssl that postman expects but it seems that # OpenSSL 3+ seems to work fine (cf. # https://github.com/NixOS/nixpkgs/issues/254325). If postman breaks apparently @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { gtk3 freetype fontconfig - mesa + libgbm nss nspr pango diff --git a/pkgs/by-name/pr/premid/package.nix b/pkgs/by-name/pr/premid/package.nix index 876c4c33de28..d7ee6482637e 100644 --- a/pkgs/by-name/pr/premid/package.nix +++ b/pkgs/by-name/pr/premid/package.nix @@ -3,7 +3,7 @@ , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence -, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu +, libgbm, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libXtst libxcb libxshmfence - mesa + libgbm nss ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { dontConfigure = true; libPath = lib.makeLibraryPath [ - libcxx systemd libpulseaudio libdrm mesa + libcxx systemd libpulseaudio libdrm libgbm stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix index e81a7294e0cc..df0a17eced36 100644 --- a/pkgs/by-name/pu/publii/package.nix +++ b/pkgs/by-name/pu/publii/package.nix @@ -15,7 +15,7 @@ , glib , gtk3 , libsecret -, mesa +, libgbm , nss , pango , udev @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { glib gtk3 libsecret - mesa + libgbm nss pango xorg.libX11 diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index cc2112a9a8cc..61b7ed3dba4c 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -14,7 +14,7 @@ , gdk-pixbuf , glib , gtk3 -, mesa +, libgbm , nss , nspr , xorg @@ -55,7 +55,7 @@ let glib gtk3 libsecret - mesa + libgbm nss nspr libdrm diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index 62360e05dc41..8b20ef8dba78 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -13,7 +13,7 @@ libgcrypt, libkrb5, libnotify, - mesa, # for libgbm + libgbm, libpulseaudio, libGL, nss, @@ -65,7 +65,7 @@ stdenv.mkDerivation { libpulseaudio libgcrypt libkrb5 - mesa + libgbm nss vips xorg.libXdamage diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix index 086d6ae60c82..3a8757e5ce2a 100644 --- a/pkgs/by-name/ra/raylib/package.nix +++ b/pkgs/by-name/ra/raylib/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , fetchpatch -, mesa +, libgbm , libGLU , glfw , libX11 @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = [ glfw ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libgbm libXi libXcursor libXrandr libXinerama ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio; diff --git a/pkgs/by-name/re/react-native-debugger/package.nix b/pkgs/by-name/re/react-native-debugger/package.nix index 61d808e23c6d..59f5ac9ce1fe 100644 --- a/pkgs/by-name/re/react-native-debugger/package.nix +++ b/pkgs/by-name/re/react-native-debugger/package.nix @@ -23,7 +23,7 @@ , makeDesktopItem , libdrm , libxkbcommon -, mesa +, libgbm , makeWrapper }: @@ -49,7 +49,7 @@ let at-spi2-core libdrm libxkbcommon - mesa + libgbm xorg.libX11 xorg.libXcursor diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix index c34dd7e92469..2da0f1cb546d 100644 --- a/pkgs/by-name/re/retroarch-bare/package.nix +++ b/pkgs/by-name/re/retroarch-bare/package.nix @@ -23,7 +23,7 @@ libXxf86vm, makeBinaryWrapper, mbedtls_2, - mesa, + libgbm, nixosTests, nvidia_cg_toolkit, pkg-config, @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { libpulseaudio libv4l libxkbcommon - mesa + libgbm udev ]; diff --git a/pkgs/by-name/ro/roam-research/linux.nix b/pkgs/by-name/ro/roam-research/linux.nix index 04a05d95ffc2..788ff9705fe6 100644 --- a/pkgs/by-name/ro/roam-research/linux.nix +++ b/pkgs/by-name/ro/roam-research/linux.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat , gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm -, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango +, libpulseaudio, libxcb, libxkbcommon, libxshmfence, libgbm, nspr, nss, pango , udev, }: let @@ -28,7 +28,7 @@ let libxcb libxkbcommon libxshmfence - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix index ab9ef85903f9..1dc3e490e14b 100644 --- a/pkgs/by-name/ro/rocketchat-desktop/package.nix +++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { at-spi2-core libdbusmenu libdrm - mesa + libgbm xorg.libxshmfence libxkbcommon ]; diff --git a/pkgs/by-name/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix index d3704f1434ff..fcc30de6e844 100644 --- a/pkgs/by-name/sc/scenefx/package.nix +++ b/pkgs/by-name/sc/scenefx/package.nix @@ -13,7 +13,7 @@ pixman, wayland-protocols, libGL, - mesa, + libgbm, validatePkgConfig, testers, wayland-scanner, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { libdrm libGL libxkbcommon - mesa + libgbm pixman wayland wayland-protocols diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix index 58477d157638..9ab4c6cdd8ff 100644 --- a/pkgs/by-name/sh/shadps4/package.nix +++ b/pkgs/by-name/sh/shadps4/package.nix @@ -16,7 +16,7 @@ libunwind, libusb1, magic-enum, - mesa, + libgbm, pkg-config, pugixml, qt6, @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libX11 xorg.libXext magic-enum - mesa + libgbm pugixml qt6.qtbase qt6.qtdeclarative diff --git a/pkgs/by-name/si/sidequest/package.nix b/pkgs/by-name/si/sidequest/package.nix index 2bf49bad8e31..88edb4c03ab2 100644 --- a/pkgs/by-name/si/sidequest/package.nix +++ b/pkgs/by-name/si/sidequest/package.nix @@ -13,7 +13,7 @@ , gdk-pixbuf , glib , gtk3 -, mesa +, libgbm , nss , nspr , libdrm @@ -67,7 +67,7 @@ gdk-pixbuf glib gtk3 - mesa + libgbm nss nspr libdrm diff --git a/pkgs/by-name/si/signal-desktop/generic.nix b/pkgs/by-name/si/signal-desktop/generic.nix index e9826312bb47..de6134797b93 100644 --- a/pkgs/by-name/si/signal-desktop/generic.nix +++ b/pkgs/by-name/si/signal-desktop/generic.nix @@ -41,7 +41,7 @@ libuuid, at-spi2-core, libappindicator-gtk3, - mesa, + libgbm, # Runtime dependencies: systemd, libnotify, @@ -164,7 +164,7 @@ stdenv.mkDerivation rec { libpulseaudio libnotify libuuid - mesa # for libgbm + libgbm nspr nss pango diff --git a/pkgs/by-name/sk/skia-aseprite/package.nix b/pkgs/by-name/sk/skia-aseprite/package.nix index 3b34ad631862..446556a126b8 100644 --- a/pkgs/by-name/sk/skia-aseprite/package.nix +++ b/pkgs/by-name/sk/skia-aseprite/package.nix @@ -14,7 +14,7 @@ libpng, libwebp, libX11, - mesa, + libgbm, ninja, python3, zlib, @@ -65,7 +65,7 @@ clangStdenv.mkDerivation (finalAttrs: { libpng libwebp libX11 - mesa + libgbm zlib ]; diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix index 7c8d184924d7..bcf2d2ed3815 100644 --- a/pkgs/by-name/sk/skypeforlinux/package.nix +++ b/pkgs/by-name/sk/skypeforlinux/package.nix @@ -33,7 +33,7 @@ libuuid, at-spi2-core, libdrm, - mesa, + libgbm, libxkbcommon, libxshmfence, }: @@ -79,7 +79,7 @@ let libv4l libdrm - mesa + libgbm libxkbcommon libxshmfence xorg.libxkbfile diff --git a/pkgs/by-name/sn/snapmaker-luban/package.nix b/pkgs/by-name/sn/snapmaker-luban/package.nix index eaa2fe15a743..af0cacb80306 100644 --- a/pkgs/by-name/sn/snapmaker-luban/package.nix +++ b/pkgs/by-name/sn/snapmaker-luban/package.nix @@ -1,6 +1,6 @@ { lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook3, fetchurl , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups -, gtk3, nss, glib, nspr, gdk-pixbuf, libdrm, mesa +, gtk3, nss, glib, nspr, gdk-pixbuf, libdrm, libgbm , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, pango , gcc-unwrapped, udev @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libXtst libxcb libxshmfence - mesa # Required for libgbm + libgbm nspr nss ]; diff --git a/pkgs/by-name/sn/sndpeek/package.nix b/pkgs/by-name/sn/sndpeek/package.nix index 7cf8636ad107..8d1ffad41c28 100644 --- a/pkgs/by-name/sn/sndpeek/package.nix +++ b/pkgs/by-name/sn/sndpeek/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libsndfile, libglut, alsa-lib, mesa, libGLU, libX11, libXmu +{ lib, stdenv, fetchurl, libsndfile, libglut, alsa-lib, libgbm, libGLU, libX11, libXmu , libXext, libXi }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libglut alsa-lib - mesa + libgbm libGLU libsndfile libX11 diff --git a/pkgs/by-name/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix index a2b7c1eb50e3..d99ef0faeafb 100644 --- a/pkgs/by-name/sp/spotify/linux.nix +++ b/pkgs/by-name/sp/spotify/linux.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook3, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, zenity -, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon +, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, libgbm, libxkbcommon , pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu, libGL # High-DPI support: Spotify's --force-device-scale-factor argument # not added if `null`, otherwise, should be a number. @@ -49,7 +49,7 @@ let libpng libpulseaudio libxkbcommon - mesa + libgbm nss_latest pango stdenv.cc.cc diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index edb84d89ca12..4fa5a81dfc13 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -8,7 +8,7 @@ , libdrm , libGL , libinput -, mesa +, libgbm , seatd , udev }: @@ -35,7 +35,7 @@ stdenv.mkDerivation (self: { libdrm libGL libinput - mesa + libgbm seatd udev ]; diff --git a/pkgs/by-name/st/stardust-xr-server/package.nix b/pkgs/by-name/st/stardust-xr-server/package.nix index f9567d8c54d7..3a1ab7059fba 100644 --- a/pkgs/by-name/st/stardust-xr-server/package.nix +++ b/pkgs/by-name/st/stardust-xr-server/package.nix @@ -8,7 +8,7 @@ fontconfig, libGL, libxkbcommon, - mesa, + libgbm, openxr-loader, pkg-config, xorg, @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { fontconfig libGL libxkbcommon - mesa + libgbm openxr-loader xorg.libX11 xorg.libXfixes diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix index 3df3516b239d..7f289d6fc528 100644 --- a/pkgs/by-name/st/staruml/package.nix +++ b/pkgs/by-name/st/staruml/package.nix @@ -5,7 +5,7 @@ , xorg, nss, nspr , atk, at-spi2-atk, dbus , gdk-pixbuf, pango, cairo -, expat, libdrm, mesa +, expat, libdrm, libgbm , alsa-lib, at-spi2-core, cups , libxkbcommon }: @@ -19,7 +19,7 @@ let nspr atk at-spi2-atk dbus gdk-pixbuf pango cairo xorg.libXrandr expat libdrm - mesa alsa-lib at-spi2-core + libgbm alsa-lib at-spi2-core cups ]; in diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix index bc727e0ebfc5..6dbea9b09bcf 100644 --- a/pkgs/by-name/st/steam/package.nix +++ b/pkgs/by-name/st/steam/package.nix @@ -52,7 +52,7 @@ let libGL libdrm - mesa # for libgbm + libgbm udev libudev0-shim libva diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index 6b63680c2e3b..68737ea5752e 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -100,7 +100,7 @@ let libGL libudev0-shim libxkbcommon - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/st/stone-phaser/package.nix b/pkgs/by-name/st/stone-phaser/package.nix index f581ae1b1cb6..74eb5130c440 100644 --- a/pkgs/by-name/st/stone-phaser/package.nix +++ b/pkgs/by-name/st/stone-phaser/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, libGL, lv2, libjack2, mesa, pkg-config }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, libGL, lv2, libjack2, libgbm, pkg-config }: stdenv.mkDerivation rec { pname = "stone-phaser"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 cairo libGL lv2 libjack2 mesa + xorg.libX11 cairo libGL lv2 libjack2 libgbm ]; postPatch = '' diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix index 88d18c2211db..80455a7dabb9 100644 --- a/pkgs/by-name/st/stress-ng/package.nix +++ b/pkgs/by-name/st/stress-ng/package.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , attr, judy, keyutils, libaio, libapparmor, libbsd, libcap, libgcrypt, lksctp-tools, zlib -, libglvnd, mesa +, libglvnd, libgbm }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # All platforms inputs then Linux-only ones buildInputs = [ judy libbsd libgcrypt zlib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - attr keyutils libaio libapparmor libcap lksctp-tools libglvnd mesa + attr keyutils libaio libapparmor libcap lksctp-tools libglvnd libgbm ]; makeFlags = [ diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index ec4aae6b0574..d13f17f25635 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -19,7 +19,7 @@ , libdrm , libglvnd , libxkbcommon -, mesa +, libgbm , nspr , nss , pango @@ -29,7 +29,7 @@ , dpkg }: let - glLibs = [ libglvnd mesa ]; + glLibs = [ libglvnd libgbm ]; libs = [ alsa-lib atkmm diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index 21234f5a34f4..75c4bcb46193 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -7,7 +7,7 @@ , stdenv , lib , libsecret -, mesa +, libgbm , udev , wrapGAppsHook3 , writeScript @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib libsecret - mesa + libgbm ]; unpackPhase = '' diff --git a/pkgs/by-name/te/tetrd/package.nix b/pkgs/by-name/te/tetrd/package.nix index a9ccf1d2774f..fd7e7a8a3c13 100644 --- a/pkgs/by-name/te/tetrd/package.nix +++ b/pkgs/by-name/te/tetrd/package.nix @@ -17,7 +17,7 @@ , libappindicator-gtk3 , libappindicator , udev -, mesa # required for libgbm +, libgbm }: stdenv.mkDerivation rec { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libappindicator-gtk3 libappindicator udev - mesa + libgbm ]; installPhase = '' diff --git a/pkgs/by-name/th/thedesk/package.nix b/pkgs/by-name/th/thedesk/package.nix index 9a398494c429..ff451d5332eb 100644 --- a/pkgs/by-name/th/thedesk/package.nix +++ b/pkgs/by-name/th/thedesk/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, alsa-lib, gtk3, libxshmfence, mesa, nss }: +, alsa-lib, gtk3, libxshmfence, libgbm, nss }: stdenv.mkDerivation rec { pname = "thedesk"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeWrapper ]; - buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; + buildInputs = [ alsa-lib gtk3 libxshmfence libgbm nss ]; dontBuild = true; dontConfigure = true; diff --git a/pkgs/by-name/ti/ticktick/package.nix b/pkgs/by-name/ti/ticktick/package.nix index 6c6797374c59..4484681e4ccb 100644 --- a/pkgs/by-name/ti/ticktick/package.nix +++ b/pkgs/by-name/ti/ticktick/package.nix @@ -8,7 +8,7 @@ , gcc-unwrapped , nss , libdrm -, mesa +, libgbm , alsa-lib , xdg-utils , systemd @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { glibc libdrm gcc-unwrapped - mesa + libgbm alsa-lib xdg-utils ]; diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index fdbc237affb3..7165e3249c93 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -27,7 +27,7 @@ , libsecret , libuuid , libxkbcommon -, mesa +, libgbm , nss , pango , systemd @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 pango systemd - mesa # for libgbm + libgbm nss libuuid libdrm diff --git a/pkgs/by-name/to/tonelib-metal/package.nix b/pkgs/by-name/to/tonelib-metal/package.nix index f337e59c2274..af6c9cf565c9 100644 --- a/pkgs/by-name/to/tonelib-metal/package.nix +++ b/pkgs/by-name/to/tonelib-metal/package.nix @@ -6,7 +6,7 @@ , alsa-lib , freetype , libglvnd -, mesa +, libgbm , curl , libXcursor , libXinerama @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { alsa-lib freetype libglvnd - mesa + libgbm ] ++ runtimeDependencies; runtimeDependencies = map lib.getLib [ diff --git a/pkgs/by-name/to/tonelib-noisereducer/package.nix b/pkgs/by-name/to/tonelib-noisereducer/package.nix index df86ff86aabb..12c80c801839 100644 --- a/pkgs/by-name/to/tonelib-noisereducer/package.nix +++ b/pkgs/by-name/to/tonelib-noisereducer/package.nix @@ -6,7 +6,7 @@ , alsa-lib , freetype , libglvnd -, mesa +, libgbm , curl , libXcursor , libXinerama @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { alsa-lib freetype libglvnd - mesa + libgbm ] ++ runtimeDependencies; runtimeDependencies = map lib.getLib [ diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 6c4c6470865b..cb4e237eeb82 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -25,7 +25,7 @@ , libXrender , libXt , libXtst -, mesa +, libgbm , pango , pciutils , zlib @@ -88,7 +88,7 @@ lib.warnIf (useHardenedMalloc != null) libXrender libXt libXtst - mesa # for libgbm + libgbm pango pciutils stdenv.cc.cc diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix index 958e0f4135e4..789dce840884 100644 --- a/pkgs/by-name/tr/tradingview/package.nix +++ b/pkgs/by-name/tr/tradingview/package.nix @@ -12,7 +12,7 @@ , libdrm , libsecret , libxkbcommon -, mesa +, libgbm , pango , sqlite , systemd @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { libdrm libsecret libxkbcommon - mesa + libgbm pango sqlite systemd diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix index 43c655750db5..474084c55f64 100644 --- a/pkgs/by-name/ty/typora/package.nix +++ b/pkgs/by-name/ty/typora/package.nix @@ -12,7 +12,7 @@ , pango , cairo , libxkbcommon -, mesa +, libgbm , expat , alsa-lib , buildFHSEnv @@ -59,7 +59,7 @@ let libdrm pango cairo - mesa + libgbm expat libxkbcommon ]) ++ (with pkgs.xorg; [ diff --git a/pkgs/by-name/um/umr/package.nix b/pkgs/by-name/um/umr/package.nix index aa9b63c3d0d7..40daecaaf627 100644 --- a/pkgs/by-name/um/umr/package.nix +++ b/pkgs/by-name/um/umr/package.nix @@ -7,7 +7,7 @@ , pkg-config , libdrm -, mesa # libgbm +, libgbm , libpciaccess , llvmPackages , nanomsg @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm - mesa + libgbm libpciaccess llvmPackages.llvm nanomsg diff --git a/pkgs/by-name/up/upwork/package.nix b/pkgs/by-name/up/upwork/package.nix index 6062be7b7200..b49bf6aa3ff2 100644 --- a/pkgs/by-name/up/upwork/package.nix +++ b/pkgs/by-name/up/upwork/package.nix @@ -2,7 +2,7 @@ , alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb , libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender -, libXScrnSaver, libXtst, mesa, nspr, nss, openssl, pango, systemd }: +, libXScrnSaver, libXtst, libgbm, nspr, nss, openssl, pango, systemd }: stdenv.mkDerivation rec { pname = "upwork"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libdrm libnotify libuuid libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes - libXi libXrandr libXrender libXScrnSaver libXtst mesa nspr nss pango systemd + libXi libXrandr libXrender libXScrnSaver libXtst libgbm nspr nss pango systemd ]; libPath = lib.makeLibraryPath buildInputs; diff --git a/pkgs/by-name/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix index 30ba2c31de98..dc12285fcf3a 100644 --- a/pkgs/by-name/vi/viber/package.nix +++ b/pkgs/by-name/vi/viber/package.nix @@ -28,7 +28,7 @@ libxml2, libxslt, libwebp, - mesa, + libgbm, nspr, nss, openssl, @@ -84,7 +84,7 @@ stdenv.mkDerivation { libxml2 libxslt libwebp - mesa + libgbm nspr nss openssl diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix index e23285511afa..5f5e7de51f26 100644 --- a/pkgs/by-name/vi/virglrenderer/package.nix +++ b/pkgs/by-name/vi/virglrenderer/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, python3 -, libGLU, libepoxy, libX11, libdrm, mesa +, libGLU, libepoxy, libX11, libdrm, libgbm , vaapiSupport ? true, libva , gitUpdater }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - buildInputs = [ libGLU libepoxy libX11 libdrm mesa ] + buildInputs = [ libGLU libepoxy libX11 libdrm libgbm ] ++ lib.optionals vaapiSupport [ libva ]; nativeBuildInputs = [ meson ninja pkg-config python3 ]; diff --git a/pkgs/by-name/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix index 4d5d665570cf..978348badaa1 100644 --- a/pkgs/by-name/vk/vkmark/package.nix +++ b/pkgs/by-name/vk/vkmark/package.nix @@ -6,7 +6,7 @@ , ninja , vulkan-headers , vulkan-loader -, mesa +, libgbm , wayland-protocols , wayland , glm @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ vulkan-headers vulkan-loader - mesa + libgbm glm assimp libxcb diff --git a/pkgs/by-name/wa/waffle/package.nix b/pkgs/by-name/wa/waffle/package.nix index b92011c967df..1e353240c408 100644 --- a/pkgs/by-name/wa/waffle/package.nix +++ b/pkgs/by-name/wa/waffle/package.nix @@ -12,7 +12,7 @@ , python3 , x11Support ? true, libxcb, libX11 , waylandSupport ? true, wayland, wayland-protocols, wayland-scanner -, useGbm ? true, mesa, udev +, useGbm ? true, libgbm, udev }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = "mesa"; + owner = "libgbm"; repo = "waffle"; rev = "v${version}"; sha256 = "sha256-Y7GRYLqSO572qA1eZ3jS8QlZ1X9xKpDtScaySTuPK/U="; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { wayland-protocols ] ++ lib.optionals useGbm [ udev - mesa + libgbm ]; depsBuildBuild = [ pkg-config ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { mainProgram = "wflinfo"; homepage = "https://www.waffle-gl.org/"; license = licenses.bsd2; - inherit (mesa.meta) platforms; + inherit (libgbm.meta) platforms; maintainers = with maintainers; [ Flakebi ]; }; } diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix index e670b0b299d8..c0dddc81acb4 100644 --- a/pkgs/by-name/wa/wavebox/package.nix +++ b/pkgs/by-name/wa/wavebox/package.nix @@ -41,7 +41,7 @@ libkrb5, libdrm, libglvnd, - mesa, + libgbm, libxkbcommon, pipewire, wayland, @@ -140,7 +140,7 @@ let libkrb5 libdrm libglvnd - mesa + libgbm coreutils libxkbcommon pipewire diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index 98844812d916..31d42a289f4d 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -18,7 +18,7 @@ libXext, libXfixes, libXrandr, - mesa, + libgbm, expat, libxcb, alsa-lib, @@ -125,7 +125,7 @@ let libXext libXfixes libXrandr - mesa + libgbm expat libxcb alsa-lib diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index cef986ddae01..d59b2a520f08 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab , meson, ninja, pkg-config, scdoc -, mesa, lz4, zstd, ffmpeg, libva +, libgbm, lz4, zstd, ffmpeg, libva , wayland, wayland-scanner }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ # Optional dependencies: - mesa lz4 zstd ffmpeg libva + libgbm lz4 zstd ffmpeg libva wayland ]; diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix index 53f993760fc1..8cf67b1f3d75 100644 --- a/pkgs/by-name/wa/wayvnc/package.nix +++ b/pkgs/by-name/wa/wayvnc/package.nix @@ -9,7 +9,7 @@ , aml , jansson , libxkbcommon -, mesa +, libgbm , neatvnc , pam , pixman @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { aml jansson libxkbcommon - mesa + libgbm neatvnc pam pixman diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix index 3a03bef180a9..652c447adb43 100644 --- a/pkgs/by-name/we/webex/package.nix +++ b/pkgs/by-name/we/webex/package.nix @@ -27,7 +27,7 @@ , libxkbcommon , libxcrypt-legacy , lshw -, mesa +, libgbm , nspr , nss , pango @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { gtk3 harfbuzz lshw - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index d5462739cf56..78374b1006d2 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -15,7 +15,7 @@ , xcbutilimage , xcbutilkeysyms , xcbutilrenderutil -, mesa +, libgbm , alsa-lib , wayland , atk @@ -121,7 +121,7 @@ let libxml2 pango libdrm - mesa + libgbm vulkan-loader systemd wayland diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix index 8cd8ba35e31b..8edcdd870081 100644 --- a/pkgs/by-name/we/weston/package.nix +++ b/pkgs/by-name/we/weston/package.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , meson, ninja, pkg-config, python3, wayland-scanner -, cairo, libGL, libdisplay-info, libdrm, libevdev, libinput, libxkbcommon, mesa +, cairo, libGL, libdisplay-info, libdrm, libevdev, libinput, libxkbcommon, libgbm , seatd, wayland, wayland-protocols, xcbutilcursor , demoSupport ? true @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ - cairo libGL libdisplay-info libdrm libevdev libinput libxkbcommon mesa seatd + cairo libGL libdisplay-info libdrm libevdev libinput libxkbcommon libgbm seatd wayland wayland-protocols ] ++ lib.optional jpegSupport libjpeg ++ lib.optional lcmsSupport lcms2 diff --git a/pkgs/by-name/wf/wf-recorder/package.nix b/pkgs/by-name/wf/wf-recorder/package.nix index 5f25b7112d98..4389f5caa463 100644 --- a/pkgs/by-name/wf/wf-recorder/package.nix +++ b/pkgs/by-name/wf/wf-recorder/package.nix @@ -13,7 +13,7 @@ x264, libpulseaudio, pipewire, - mesa, # for libgbm + libgbm, fetchpatch, }: @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { x264 libpulseaudio pipewire - mesa + libgbm ]; meta = with lib; { diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix index b41db6fcf2a3..8621d4192070 100644 --- a/pkgs/by-name/wi/wio/package.nix +++ b/pkgs/by-name/wi/wio/package.nix @@ -6,7 +6,7 @@ , cairo , libxkbcommon , makeWrapper -, mesa +, libgbm , meson , ninja , pkg-config @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo libxkbcommon - mesa + libgbm udev wayland wayland-protocols diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index 4959b6fdd2ee..1e2ea9b61c28 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -11,7 +11,7 @@ , xar , libdbusmenu , alsa-lib -, mesa +, libgbm , nss , nspr , systemd @@ -103,7 +103,7 @@ let buildInputs = [ alsa-lib - mesa + libgbm nss nspr systemd diff --git a/pkgs/by-name/wl/wlvncc/package.nix b/pkgs/by-name/wl/wlvncc/package.nix index 0e0e64a658d2..a4d34e383c24 100644 --- a/pkgs/by-name/wl/wlvncc/package.nix +++ b/pkgs/by-name/wl/wlvncc/package.nix @@ -12,7 +12,7 @@ , libpng , libxkbcommon , lzo -, mesa +, libgbm , meson , ninja , openssl @@ -52,7 +52,7 @@ stdenv.mkDerivation { libpng libxkbcommon lzo - mesa + libgbm openssl pixman wayland diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix index 325d05327367..2faeef563927 100644 --- a/pkgs/by-name/xa/xarcan/package.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -19,7 +19,7 @@ , libxcb , libxkbfile , libxshmfence -, mesa +, libgbm , meson , nettle , ninja @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalPackages: { libxcb libxkbfile libxshmfence - mesa + libgbm nettle openssl pixman diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index 613400dcd7d2..787a2bf83502 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , gst_all_1 -, mesa +, libgbm , pkg-config , libglvnd , libxkbcommon @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ]; - buildInputs = [ libglvnd libxkbcommon mesa pipewire wayland ]; + buildInputs = [ libglvnd libxkbcommon libgbm pipewire wayland ]; checkInputs = [ gst_all_1.gstreamer ]; # Force linking to libEGL, which is always dlopen()ed, and to diff --git a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix index e215028d7352..10e81f4d12e3 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix @@ -11,7 +11,7 @@ , grim , inih , libdrm -, mesa +, libgbm , pipewire , scdoc , slurp @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner makeWrapper ]; - buildInputs = [ inih libdrm mesa pipewire systemd wayland wayland-protocols ]; + buildInputs = [ inih libdrm libgbm pipewire systemd wayland wayland-protocols ]; mesonFlags = [ "-Dsd-bus-provider=libsystemd" diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix index 0d1ed5721d32..a635806cbd01 100644 --- a/pkgs/by-name/xe/xemu/package.nix +++ b/pkgs/by-name/xe/xemu/package.nix @@ -12,7 +12,7 @@ libpcap, libsamplerate, libslirp, - mesa, + libgbm, meson, ninja, openssl, @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { libpcap libsamplerate libslirp - mesa + libgbm openssl vte ]; diff --git a/pkgs/by-name/ya/yandex-browser/package.nix b/pkgs/by-name/ya/yandex-browser/package.nix index 21469edcbca9..cf537fefc008 100644 --- a/pkgs/by-name/ya/yandex-browser/package.nix +++ b/pkgs/by-name/ya/yandex-browser/package.nix @@ -40,7 +40,7 @@ , libpulseaudio , libuuid , libxshmfence -, mesa +, libgbm , nspr , pango , systemd @@ -125,7 +125,7 @@ in stdenv.mkDerivation rec { libuuid libxcb libxshmfence - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/ye/yesplaymusic/package.nix b/pkgs/by-name/ye/yesplaymusic/package.nix index c10184161f93..dc447afdb614 100644 --- a/pkgs/by-name/ye/yesplaymusic/package.nix +++ b/pkgs/by-name/ye/yesplaymusic/package.nix @@ -11,7 +11,7 @@ , cups , nspr , nss -, mesa # for libgbm +, libgbm , xorg , xdg-utils , libdrm @@ -53,7 +53,7 @@ let cups nspr nss - mesa + libgbm xorg.libxshmfence xorg.libXScrnSaver xorg.libXtst diff --git a/pkgs/by-name/za/zaz/package.nix b/pkgs/by-name/za/zaz/package.nix index dca1d74a43ff..8c574c1b9fa1 100644 --- a/pkgs/by-name/za/zaz/package.nix +++ b/pkgs/by-name/za/zaz/package.nix @@ -3,7 +3,7 @@ , pkg-config , SDL , SDL_image -, mesa +, libgbm , libtheora , libvorbis , libogg @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ (lib.getDev SDL) SDL_image - mesa + libgbm libtheora libvorbis.dev libogg diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 8cc0e23c6a8c..5e066ef6edcd 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -21,7 +21,7 @@ , gtk3 , gdk-pixbuf , glib -, mesa +, libgbm , nspr , nss , pango @@ -87,7 +87,7 @@ let gtk3 gdk-pixbuf glib - mesa + libgbm nspr nss pango diff --git a/pkgs/by-name/zo/zotero-beta/package.nix b/pkgs/by-name/zo/zotero-beta/package.nix index e8da30471190..8920adc69a52 100644 --- a/pkgs/by-name/zo/zotero-beta/package.nix +++ b/pkgs/by-name/zo/zotero-beta/package.nix @@ -12,7 +12,7 @@ , gtk3 , libGL , xorg -, mesa +, libgbm , pango , pciutils }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { xorg.libXrandr xorg.libXtst xorg.libxcb - mesa + libgbm pango pciutils ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix index 5a3d3570fc3f..11da05257900 100644 --- a/pkgs/by-name/zo/zotero/linux.nix +++ b/pkgs/by-name/zo/zotero/linux.nix @@ -17,7 +17,7 @@ libGL, libva, xorg, - mesa, + libgbm, pango, pciutils, }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { xorg.libXrandr xorg.libXtst xorg.libxcb - mesa + libgbm pango pciutils ] diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix index 5db2a43a5596..49e1ec49d769 100644 --- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix +++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix @@ -11,7 +11,7 @@ gsettings-qt, libepoxy, libinput, - mesa, + libgbm, lcms2, xorg, }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { gsettings-qt libinput - mesa + libgbm lcms2 xorg.libxcb diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index ce6f77537863..8a567ce8445a 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -39,7 +39,7 @@ , libxkbcommon , luajit , lz4 -, mesa +, libgbm , mint-x-icons , openjpeg , openssl @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { libsndfile libtiff lz4 - mesa + libgbm openssl systemd udev diff --git a/pkgs/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix index 59169cd510c8..37cc06084e07 100644 --- a/pkgs/desktops/plasma-5/kpipewire.nix +++ b/pkgs/desktops/plasma-5/kpipewire.nix @@ -6,7 +6,7 @@ , plasma-wayland-protocols , libepoxy , ffmpeg -, mesa +, libgbm , pipewire , wayland }: @@ -20,7 +20,7 @@ mkDerivation { kcoreaddons plasma-wayland-protocols ffmpeg - mesa + libgbm pipewire wayland ]; diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 81f588b4d703..b132dfe0167f 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -12,7 +12,7 @@ , libdrm , libinput , libxkbcommon -, mesa +, libgbm , pipewire , udev , wayland @@ -72,7 +72,7 @@ mkDerivation { libdrm libinput libxkbcommon - mesa + libgbm pipewire udev wayland diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index e5822cb89803..9784c07cfc18 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -5,7 +5,7 @@ , wayland-scanner , cups , libepoxy -, mesa +, libgbm , pcre , pipewire , wayland @@ -30,7 +30,7 @@ mkDerivation { buildInputs = [ cups libepoxy - mesa + libgbm pcre pipewire wayland diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 19d24f47da47..bcd97a5becb8 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -8,7 +8,7 @@ libffi, libpng, libjpeg, - mesa, + libgbm, libGL, eigen, openblas, @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { openblas ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - mesa + libgbm libGL ]; diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix index a868a441ba4c..71d24fd46960 100644 --- a/pkgs/development/compilers/jetbrains-jdk/17.nix +++ b/pkgs/development/compilers/jetbrains-jdk/17.nix @@ -23,7 +23,7 @@ , nss , nspr , libdrm -, mesa +, libgbm , wayland , udev }: @@ -111,7 +111,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { # Build the set of output library directories to rpath against LIBDIRS="${lib.makeLibraryPath [ libXdamage libXxf86vm libXrandr libXi libXcursor libXrender libX11 libXext libxcb - nss nspr libdrm mesa wayland udev + nss nspr libdrm libgbm wayland udev ]}" for output in $outputs; do if [ "$output" = debug ]; then continue; fi diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 77ac8e904d47..cced16978967 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -22,7 +22,7 @@ , nss , nspr , libdrm -, mesa +, libgbm , wayland , udev }: @@ -111,7 +111,7 @@ jdk.overrideAttrs (oldAttrs: rec { # Build the set of output library directories to rpath against LIBDIRS="${lib.makeLibraryPath [ libXdamage libXxf86vm libXrandr libXi libXcursor libXrender libX11 libXext libxcb - nss nspr libdrm mesa wayland udev + nss nspr libdrm libgbm wayland udev ]}" for output in $outputs; do if [ "$output" = debug ]; then continue; fi diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 9cda4fc51623..f28e78ea2e1a 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -31,7 +31,7 @@ , libXext , libXfixes , libXrandr -, mesa +, libgbm , gtk3 , pango , cairo @@ -66,7 +66,7 @@ let libXext libXfixes libXrandr - mesa + libgbm gtk3 pango cairo diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index 3970830e7567..1302fb4f305b 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -247,7 +247,7 @@ filterAndCreateOverrides { libcurand, libGLU, libglvnd, - mesa, + libgbm, }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ @@ -256,7 +256,7 @@ filterAndCreateOverrides { libcurand libGLU libglvnd - mesa + libgbm ]; }; @@ -320,7 +320,7 @@ filterAndCreateOverrides { "nsight-systems/*/*/libexec" "nsight-systems/*/*/libQt*" "nsight-systems/*/*/libstdc*" - "nsight-systems/*/*/Mesa" + "nsight-systems/*/*/libgbm" "nsight-systems/*/*/Plugins" "nsight-systems/*/*/python/bin/python" ]; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 9e319154717b..926841fe1dd0 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, nix-update-script, pkg-config, + mesa, libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms, openglSupport ? libGLSupported, libGL, @@ -27,7 +28,7 @@ wayland-scanner, drmSupport ? false, libdrm, - mesa, + libgbm, libxkbcommon, dbusSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, dbus, @@ -146,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals drmSupport [ libdrm - mesa + libgbm ]; buildInputs = diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index db34dc1669b1..01c7d8568e67 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -13,7 +13,7 @@ , gobject-introspection , wayland , gnome -, mesa +, libgbm , automake , autoconf , gstreamerSupport ? true @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { gobject-introspection ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland - mesa + libgbm libGL xorg.libXrandr xorg.libXfixes diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 9595efc1c1b9..7c44d88334d6 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -17,7 +17,7 @@ , libXext , libXfixes , libXrandr -, mesa +, libgbm , gtk3 , pango , cairo @@ -50,7 +50,7 @@ let libXext libXfixes libXrandr - mesa + libgbm gtk3 pango cairo diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 53944f5a5e94..2b9d2b53e67f 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -15,7 +15,7 @@ , runtimeShell , withXorg ? true , testers -, mesa +, libgbm }: stdenv.mkDerivation (finalAttrs: { @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ilur"; license = licenses.lgpl2; pkgConfigModules = [ "IL" ]; - inherit (mesa.meta) platforms; + inherit (libgbm.meta) platforms; maintainers = [ ]; }; }) diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index ef311bdd0246..e2283b23449a 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -8,7 +8,7 @@ , ninja , pkg-config , gcc -, mesa +, libgbm , gtk3 , glfw , libGLU @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nlohmann_json ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] ++ lib.optionals enablePython (with pythonPackages; [ python pybind11 ]) - ++ lib.optionals enableGUI [ mesa gtk3 glfw libGLU curl ]; + ++ lib.optionals enableGUI [ libgbm gtk3 glfw libGLU curl ]; patches = [ ./py_pybind11_no_external_download.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index 8fe5a0b32ec6..a679d17d87e8 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -58,7 +58,7 @@ , libxslt , lcms2 , libkrb5 -, mesa +, libgbm , enableProprietaryCodecs ? true # darwin , autoSignDarwinBinariesHook @@ -245,7 +245,7 @@ qtModule { pipewire libkrb5 - mesa + libgbm ]; buildInputs = [ diff --git a/pkgs/development/libraries/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix index 190a13e15a27..e59fa5ddd744 100644 --- a/pkgs/development/libraries/qwlroots/default.nix +++ b/pkgs/development/libraries/qwlroots/default.nix @@ -10,7 +10,7 @@ , wayland-protocols , wlr-protocols , pixman -, mesa +, libgbm , vulkan-loader , libinput , xorg @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols wlr-protocols pixman - mesa + libgbm vulkan-loader libinput xorg.libXdmcp diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 7f6213c7df18..b258b6270873 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -12,7 +12,7 @@ , libxkbcommon , pixman , libcap -, mesa +, libgbm , xorg , libpng , ffmpeg @@ -63,7 +63,7 @@ let libinput libpng libxkbcommon - mesa + libgbm pixman seatd vulkan-loader diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 09cf9684c4d5..8fd324dff01f 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -27,7 +27,7 @@ libXtst, libXxf86vm, libglvnd, - mesa, + libgbm, pango, SDL, webkitgtk_4_0, @@ -93,7 +93,7 @@ buildPythonPackage rec { libXtst libXxf86vm libglvnd - mesa + libgbm webkitgtk_4_0 xorgproto ]; diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 6835c8a6263e..a6db9df175a2 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -9,7 +9,7 @@ , unzip , at-spi2-atk , libdrm -, mesa +, libgbm , libxkbcommon , libxshmfence , libGL @@ -100,7 +100,7 @@ let stdenv.cc.cc systemd ] - ++ lib.optionals (lib.versionAtLeast version "9.0.0") [ libdrm mesa ] + ++ lib.optionals (lib.versionAtLeast version "9.0.0") [ libdrm libgbm ] ++ lib.optionals (lib.versionOlder version "10.0.0") [ libXScrnSaver ] ++ lib.optionals (lib.versionAtLeast version "11.0.0") [ libxkbcommon ] ++ lib.optionals (lib.versionAtLeast version "12.0.0") [ libxshmfence ] diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index b2e70731acc4..e94452eb97ae 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -24,7 +24,7 @@ , libxcb , libxkbcommon , makeWrapper -, mesa +, libgbm , nspr , nss , pango @@ -59,7 +59,7 @@ let libGL libnotify libxkbcommon - mesa + libgbm nspr nss pango diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index d7d2bd2c2a8c..17c654c96610 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { alsa-lib nss libdrm - mesa + libgbm nspr atk dbus diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 1cd212b84227..e560a3ed4de9 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -6,7 +6,7 @@ , lib , buildPackages , makeShellWrapper -, mesa +, libgbm , nss , stdenv , udev @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { gtk2 alsa-lib gtk3 - mesa # for libgbm + libgbm ]) ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa CoreServices diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index 5c8062bb6f70..8c89a34918f0 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -37,7 +37,7 @@ libxkbcommon, libxml2, libxslt, - mesa, + libgbm, sqlite, systemdLibs, wayland-scanner, @@ -113,7 +113,7 @@ stdenv.mkDerivation { libvpx' libxml2 libxslt - mesa + libgbm sqlite systemdLibs wayland-scanner diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix index eb604d1a61c4..e717b24d5394 100644 --- a/pkgs/kde/plasma/kpipewire/default.nix +++ b/pkgs/kde/plasma/kpipewire/default.nix @@ -4,7 +4,7 @@ pkg-config, pipewire, ffmpeg, - mesa, + libgbm, libva, }: mkKdeDerivation { @@ -15,7 +15,7 @@ mkKdeDerivation { qtquick3d pipewire ffmpeg - mesa + libgbm libva ]; } diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index 306498d07e05..0d78ac721cf2 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -12,7 +12,7 @@ libcanberra, libdisplay-info, libei, - mesa, + libgbm, lcms2, pipewire, krunner, @@ -54,7 +54,7 @@ mkKdeDerivation { krunner - mesa # libgbm + libgbm lcms2 libcanberra libdisplay-info diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 35d8a071fe11..1c9ed84ae165 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -14,7 +14,7 @@ , libGL , libglvnd , lxc -, mesa +, libgbm , properties-cpp , protobuf , protobufc @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { libdwarf libGL lxc - mesa + libgbm properties-cpp protobuf python3 diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index b74af83021d9..9b7273d35cbc 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -107,7 +107,7 @@ let zlib stdenv.cc.cc wayland - mesa + libgbm libGL openssl dbus # for nvidia-powerd diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix index 4041ae7cf087..e41798d6aa08 100644 --- a/pkgs/servers/mir/common.nix +++ b/pkgs/servers/mir/common.nix @@ -25,7 +25,7 @@ libxmlxx, yaml-cpp, lttng-ust, - mesa, + libgbm, nettle, udev, wayland, @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { libxmlxx yaml-cpp lttng-ust - mesa + libgbm nettle udev wayland diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index 6ced9624b741..9c58a0ba85f3 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -21,7 +21,7 @@ , wayland-scanner , libffi , libcap -, mesa +, libgbm , curl , pcre , pcre2 @@ -131,7 +131,7 @@ stdenv'.mkDerivation rec { libva libvdpau numactl - mesa + libgbm amf-headers svt-av1 libappindicator @@ -145,7 +145,7 @@ stdenv'.mkDerivation rec { runtimeDependencies = [ avahi - mesa + libgbm xorg.libXrandr libxcb libglvnd diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 912f70e3b39d..cccb5723f5cc 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2776,7 +2776,7 @@ self: with self; { })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { + xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libgbm, libGL, libdrm, udev, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-amdgpu"; version = "23.0.0"; builder = ./builder.sh; @@ -2787,7 +2787,7 @@ self: with self; { hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; + buildInputs = [ xorgproto libgbm libGL libdrm udev xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { pkgConfigModules = [ ]; @@ -2856,7 +2856,7 @@ self: with self; { })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { + xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libgbm, libGL, libdrm, udev, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-ati"; version = "22.0.0"; builder = ./builder.sh; @@ -2867,7 +2867,7 @@ self: with self; { hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; + buildInputs = [ xorgproto libgbm libGL libdrm udev libpciaccess xorgserver ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { pkgConfigModules = [ ]; diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 8bfc01d79933..866043c6e8bf 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -27,7 +27,7 @@ , libxkbfile , libxshmfence , libxcvt -, mesa +, libgbm , meson , ninja , openssl @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { libxkbfile libxshmfence libxcvt - mesa + libgbm openssl pixman systemd diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index c80d28c2f863..e73e8b406b0c 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, udev, libdrm, mesa +{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, udev, libdrm, libgbm , dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook3 , runtimeShell, gsettings-desktop-schemas }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.libxcb libdrm - mesa.out + libgbm ]; runtimeDependencies = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c93fc93f96f6..377796fcf34c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17961,7 +17961,6 @@ self: super: with self; { wxGTK = pkgs.wxGTK32.override { withWebKit = true; }; - inherit (pkgs) mesa; }; wyoming = callPackage ../development/python-modules/wyoming { };