diff options
| author | flyingpeakock <github@phlipphlop.me> | 2026-02-15 16:53:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-15 17:53:28 +0200 |
| commit | 59f19e465b0fa630934ab391d3cc0ebeaccc9dbc (patch) | |
| tree | 5fe0334dd2e0508477e08758bd67e587f65e3e76 | |
| parent | e6ca1413648407c9a7b14f33673f67c31b296410 (diff) | |
nix: fix evaluation warnings, the xorg package set has been deprecated (#13231)
Co-authored-by: Philip Johansson <philip@phlipphlop.me>
| -rw-r--r-- | nix/default.nix | 21 | ||||
| -rw-r--r-- | nix/tests/default.nix | 2 |
2 files changed, 14 insertions, 9 deletions
diff --git a/nix/default.nix b/nix/default.nix index b458247e..eee38887 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -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) diff --git a/nix/tests/default.nix b/nix/tests/default.nix index df666e62..6052ee16 100644 --- a/nix/tests/default.nix +++ b/nix/tests/default.nix @@ -11,7 +11,7 @@ in { jq kitty wl-clipboard - xorg.xeyes + xeyes ]; # Enabled by default for some reason |