Skip to content

Commit e6407db

Browse files
authored
treewide: mesa -> libgbm, but again and more (#375759)
2 parents c45b06d + c900728 commit e6407db

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

pkgs/by-name/sd/sdl3/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
libpulseaudio,
2020
libusb1,
2121
libxkbcommon,
22-
mesa,
22+
libgbm,
2323
ninja,
2424
nix-update-script,
2525
nixosTests,
@@ -38,7 +38,7 @@
3838
ibusSupport ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin,
3939
jackSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
4040
libdecorSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
41-
openglSupport ? lib.meta.availableOn stdenv.hostPlatform mesa,
41+
openglSupport ? lib.meta.availableOn stdenv.hostPlatform libGL,
4242
pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
4343
pulseaudioSupport ?
4444
config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
@@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
110110
++ lib.optional dbusSupport dbus
111111
++ lib.optionals drmSupport [
112112
libdrm
113-
mesa # libgbm
113+
libgbm
114114
]
115115
++ lib.optional jackSupport libjack2
116116
++ lib.optional libdecorSupport libdecor

pkgs/by-name/sh/shadps4/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
libunwind,
1818
libusb1,
1919
magic-enum,
20-
mesa,
20+
libgbm,
2121
pkg-config,
2222
pugixml,
2323
qt6,
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
6868
xorg.libX11
6969
xorg.libXext
7070
magic-enum
71-
mesa
71+
libgbm
7272
pugixml
7373
qt6.qtbase
7474
qt6.qtdeclarative

pkgs/by-name/xa/xarcan/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalPackages: {
7676
libxkbfile
7777
libxshmfence
7878
libgbm
79-
mesa
79+
mesa # uses dri_interface.h
8080
nettle
8181
openssl
8282
pixman

pkgs/desktops/enlightenment/efl/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
9191
libsndfile
9292
libtiff
9393
lz4
94-
mesa
94+
mesa # actually uses eglmesaext
9595
openssl
9696
systemd
9797
udev

pkgs/servers/x11/xorg/xwayland.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
9999
libxkbfile
100100
libxshmfence
101101
libxcvt
102-
mesa
102+
mesa # uses dri_interface.h
103103
openssl
104104
pixman
105105
systemd

0 commit comments

Comments
 (0)