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:
parent
e6ca141364
commit
59f19e465b
2 changed files with 14 additions and 9 deletions
|
|
@ -25,6 +25,12 @@
|
|||
libdrm,
|
||||
libexecinfo,
|
||||
libinput,
|
||||
libxcb,
|
||||
libxcb-errors,
|
||||
libxcb-render-util,
|
||||
libxcb-wm,
|
||||
libxdmcp,
|
||||
libxcursor,
|
||||
libxkbcommon,
|
||||
libuuid,
|
||||
libgbm,
|
||||
|
|
@ -38,7 +44,6 @@
|
|||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
xorg,
|
||||
xwayland,
|
||||
debug ? false,
|
||||
withTests ? false,
|
||||
|
|
@ -154,11 +159,12 @@ in
|
|||
hyprutils
|
||||
hyprwire
|
||||
libdrm
|
||||
libgbm
|
||||
libGL
|
||||
libinput
|
||||
libuuid
|
||||
libxcursor
|
||||
libxkbcommon
|
||||
libgbm
|
||||
muparser
|
||||
pango
|
||||
pciutils
|
||||
|
|
@ -168,16 +174,15 @@ in
|
|||
wayland
|
||||
wayland-protocols
|
||||
wayland-scanner
|
||||
xorg.libXcursor
|
||||
]
|
||||
(optionals customStdenv.hostPlatform.isBSD [epoll-shim])
|
||||
(optionals customStdenv.hostPlatform.isMusl [libexecinfo])
|
||||
(optionals enableXWayland [
|
||||
xorg.libxcb
|
||||
xorg.libXdmcp
|
||||
xorg.xcbutilerrors
|
||||
xorg.xcbutilrenderutil
|
||||
xorg.xcbutilwm
|
||||
libxcb
|
||||
libxcb-errors
|
||||
libxcb-render-util
|
||||
libxcb-wm
|
||||
libxdmcp
|
||||
xwayland
|
||||
])
|
||||
(optional withSystemd systemd)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ in {
|
|||
jq
|
||||
kitty
|
||||
wl-clipboard
|
||||
xorg.xeyes
|
||||
xeyes
|
||||
];
|
||||
|
||||
# Enabled by default for some reason
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue