diff --git a/comfy-core/Cargo.toml b/comfy-core/Cargo.toml index 1892f54..8b3df3c 100644 --- a/comfy-core/Cargo.toml +++ b/comfy-core/Cargo.toml @@ -20,6 +20,8 @@ memprof = ["tracy"] lua = ["mlua"] blobs = ["dep:blobs"] +wayland = ["winit/wayland"] + [dependencies] smallvec = "1.10.0" diff --git a/comfy/Cargo.toml b/comfy/Cargo.toml index ed39954..1bd99c3 100644 --- a/comfy/Cargo.toml +++ b/comfy/Cargo.toml @@ -22,7 +22,7 @@ demo = [] dev = [] embedded-assets = [] quick-exit = [] -ci-release = ["comfy-core/ci-release", "comfy-wgpu/ci-release"] +ci-release = ["comfy-core/ci-release", "comfy-wgpu/ci-release", "wayland"] tracy = ["comfy-core/tracy", "comfy-wgpu/tracy"] # tracy = ["comfy-core/tracy", "blobs/tracy", "comfy-wgpu/tracy"] @@ -30,6 +30,8 @@ tracy = ["comfy-core/tracy", "comfy-wgpu/tracy"] jemalloc = ["comfy-core/jemalloc"] lua = ["comfy-core/lua"] +wayland = ["comfy-core/wayland"] + [dependencies] comfy-wgpu = { path = "../comfy-wgpu", version = "0.2.0" } comfy-core = { path = "../comfy-core", version = "0.2.0" } diff --git a/flake.nix b/flake.nix index fbd1609..9c36c59 100644 --- a/flake.nix +++ b/flake.nix @@ -46,12 +46,15 @@ vulkan-loader vulkan-validation-layers - # wayland + # X xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr + # wayland + wayland + # extra tooling tracy # profiler, call with ~Tracy~ ]; @@ -66,6 +69,8 @@ vulkan-loader # wayland + wayland + # xstuff xorg.libX11 xorg.libXcursor