Merge pull request #1062 from DarkGuibrine/main

fix NixOS error in the build
This commit is contained in:
DreamMaoMao 2026-06-17 08:43:42 +08:00
commit 5652066c68
2 changed files with 4 additions and 0 deletions

View file

@ -26,6 +26,7 @@ endif
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
libm = cc.find_library('m') libm = cc.find_library('m')
libdrm = dependency('libdrm')
xcb = dependency('xcb', required : get_option('xwayland')) xcb = dependency('xcb', required : get_option('xwayland'))
xlibs = dependency('xcb-icccm', required : get_option('xwayland')) xlibs = dependency('xcb-icccm', required : get_option('xwayland'))
wayland_server_dep = dependency('wayland-server',version: '>=1.23.1') wayland_server_dep = dependency('wayland-server',version: '>=1.23.1')
@ -100,6 +101,7 @@ executable('mango',
wayland_sources, wayland_sources,
dependencies : [ dependencies : [
libm, libm,
libdrm,
xcb, xcb,
xlibs, xlibs,
libscenefx_dep, libscenefx_dep,

View file

@ -3,6 +3,7 @@
libX11, libX11,
libinput, libinput,
libxcb, libxcb,
libdrm,
libxkbcommon, libxkbcommon,
pcre2, pcre2,
pango, pango,
@ -58,6 +59,7 @@ stdenv.mkDerivation {
wlroots_0_19 wlroots_0_19
scenefx scenefx
libGL libGL
libdrm
] ]
++ lib.optionals enableXWayland [ ++ lib.optionals enableXWayland [
libX11 libX11