Nix & meson: 0.16.0 -> 0.17.0

Nix: make xwayland dependencies optional
2022-10-31 12:41:31 +02:00 · 2022-10-31 12:41:31 +02:00 · b6e33830af
commit b6e33830af
parent 2c67c1c4f8
3 changed files with 3 additions and 5 deletions
--- a/nix/default.nix
+++ b/nix/default.nix
@ -62,7 +62,6 @@ in
          git
          libdrm
          libinput
-          libxcb
          libxkbcommon
          mesa
          pango
@ -70,9 +69,8 @@ in
          wayland-protocols
          wayland-scanner
          (wlroots.override {inherit enableXWayland hidpiXWayland nvidiaPatches;})
-          xcbutilwm
        ]
-        ++ lib.optional enableXWayland xwayland;
+        ++ lib.optionals enableXWayland [libxcb xcbutilwm xwayland];

      mesonBuildType =
        if debug