Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: mesa -> libgbm, but again and more #375759

Merged
merged 5 commits into from
Jan 22, 2025
Merged

treewide: mesa -> libgbm, but again and more #375759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83aee58
SDL3: mesa -> libgbm
K900 Jan 22, 2025
2afb643
shadps4: mesa -> libgbm
K900 Jan 22, 2025
9cca2e8
efl: annotate why we use mesa
K900 Jan 22, 2025
7891706
xwayland: annotate why we use mesa
K900 Jan 22, 2025
c900728
xarcan: annotate why we use mesa
K900 Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/by-name/sd/sdl3/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
libpulseaudio,
libusb1,
libxkbcommon,
mesa,
libgbm,
ninja,
nix-update-script,
nixosTests,
Expand All @@ -38,7 +38,7 @@
ibusSupport ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin,
jackSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
libdecorSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
openglSupport ? lib.meta.availableOn stdenv.hostPlatform mesa,
openglSupport ? lib.meta.availableOn stdenv.hostPlatform libGL,
pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
pulseaudioSupport ?
config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
Expand Down Expand Up @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional dbusSupport dbus
++ lib.optionals drmSupport [
libdrm
mesa # libgbm
libgbm
]
++ lib.optional jackSupport libjack2
++ lib.optional libdecorSupport libdecor
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/sh/shadps4/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
libunwind,
libusb1,
magic-enum,
mesa,
libgbm,
pkg-config,
pugixml,
qt6,
Expand Down Expand Up @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
xorg.libX11
xorg.libXext
magic-enum
mesa
libgbm
pugixml
qt6.qtbase
qt6.qtdeclarative
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/xa/xarcan/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalPackages: {
libxkbfile
libxshmfence
libgbm
mesa
mesa # uses dri_interface.h
nettle
openssl
pixman
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/enlightenment/efl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
libsndfile
libtiff
lz4
mesa
mesa # actually uses eglmesaext
openssl
systemd
udev
Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/xwayland.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
libxkbfile
libxshmfence
libxcvt
mesa
mesa # uses dri_interface.h
openssl
pixman
systemd
Expand Down