nix: fix evaluation warnings, the xorg package set has been deprecated (#13231)

Co-authored-by: Philip Johansson <philip@phlipphlop.me>
This commit is contained in:
flyingpeakock 2026-02-15 16:53:28 +01:00 committed by GitHub
parent e6ca141364
commit 59f19e465b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 9 deletions

View file

@ -25,6 +25,12 @@
libdrm, libdrm,
libexecinfo, libexecinfo,
libinput, libinput,
libxcb,
libxcb-errors,
libxcb-render-util,
libxcb-wm,
libxdmcp,
libxcursor,
libxkbcommon, libxkbcommon,
libuuid, libuuid,
libgbm, libgbm,
@ -38,7 +44,6 @@
wayland, wayland,
wayland-protocols, wayland-protocols,
wayland-scanner, wayland-scanner,
xorg,
xwayland, xwayland,
debug ? false, debug ? false,
withTests ? false, withTests ? false,
@ -154,11 +159,12 @@ in
hyprutils hyprutils
hyprwire hyprwire
libdrm libdrm
libgbm
libGL libGL
libinput libinput
libuuid libuuid
libxcursor
libxkbcommon libxkbcommon
libgbm
muparser muparser
pango pango
pciutils pciutils
@ -168,16 +174,15 @@ in
wayland wayland
wayland-protocols wayland-protocols
wayland-scanner wayland-scanner
xorg.libXcursor
] ]
(optionals customStdenv.hostPlatform.isBSD [epoll-shim]) (optionals customStdenv.hostPlatform.isBSD [epoll-shim])
(optionals customStdenv.hostPlatform.isMusl [libexecinfo]) (optionals customStdenv.hostPlatform.isMusl [libexecinfo])
(optionals enableXWayland [ (optionals enableXWayland [
xorg.libxcb libxcb
xorg.libXdmcp libxcb-errors
xorg.xcbutilerrors libxcb-render-util
xorg.xcbutilrenderutil libxcb-wm
xorg.xcbutilwm libxdmcp
xwayland xwayland
]) ])
(optional withSystemd systemd) (optional withSystemd systemd)

View file

@ -11,7 +11,7 @@ in {
jq jq
kitty kitty
wl-clipboard wl-clipboard
xorg.xeyes xeyes
]; ];
# Enabled by default for some reason # Enabled by default for some reason