Skip to content

Commit 9bb2c04

Browse files
committed
nix: remove qtwayland dependency when qt >= 6.10
QtWaylandClient was moved into QtBase in 6.10. The QtWayland packages is now only the wayland server code which Quickshell does not need.
1 parent 3bcc199 commit 9bb2c04

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

default.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
spirv-tools
5858
pkg-config
5959
]
60+
++ lib.optional (withWayland && lib.strings.compareVersions qt6.qtbase.version "6.10.0" == -1) qt6.qtwayland
6061
++ lib.optionals withWayland [
6162
qt6.qtwayland # qtwaylandscanner required at build time
6263
wayland-scanner
@@ -70,7 +71,8 @@
7071
++ lib.optional withQtSvg qt6.qtsvg
7172
++ lib.optional withCrashReporter breakpad
7273
++ lib.optional withJemalloc jemalloc
73-
++ lib.optionals withWayland [ qt6.qtwayland wayland wayland-protocols ]
74+
++ lib.optional (withWayland && lib.strings.compareVersions qt6.qtbase.version "6.10.0" == -1) qt6.qtwayland
75+
++ lib.optionals withWayland [ wayland wayland-protocols ]
7476
++ lib.optionals (withWayland && libgbm != null) [ libdrm libgbm ]
7577
++ lib.optional withX11 xorg.libxcb
7678
++ lib.optional withPam pam

0 commit comments

Comments
 (0)