From fe27d9361803a186ce804c9b282d20ab286507c9 Mon Sep 17 00:00:00 2001
From: aviac <aviac@mailbox.org>
Date: Thu, 19 Oct 2023 21:55:26 +0200
Subject: [PATCH 1/3] feat: add wayland feature flag for comfy crate

This allows the user to specify the feature directly on the comfy crate
instead of needing to import the winit crate and specifying the feature
there
---
 comfy-core/Cargo.toml | 2 ++
 comfy/Cargo.toml      | 2 ++
 2 files changed, 4 insertions(+)

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..e62e9b5 100644
--- a/comfy/Cargo.toml
+++ b/comfy/Cargo.toml
@@ -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" }

From 9eeb31aed702c8f159e5494cea5f1cca723ab4bb Mon Sep 17 00:00:00 2001
From: aviac <aviac@mailbox.org>
Date: Thu, 19 Oct 2023 21:56:41 +0200
Subject: [PATCH 2/3] chore: adjust the flake.nix to also support a wayland dev
 env

---
 flake.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

From 7969f2c3a9aed9484cf772275157d3211826424d Mon Sep 17 00:00:00 2001
From: aviac <aviac@mailbox.org>
Date: Thu, 19 Oct 2023 21:59:48 +0200
Subject: [PATCH 3/3] chore: as requested in #51 include feature flag for
 ci-release

---
 comfy/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/comfy/Cargo.toml b/comfy/Cargo.toml
index e62e9b5..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"]