Merge pull request #54 from RobWalt/feat/wayland-support

feature: add wayland support
darthdeus · Oct 19, 2023 · f5cb05f · f5cb05f
2 parents f51844c + 7969f2c
commit f5cb05f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -22,14 +22,16 @@ 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"]
 
 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
@@ -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