diff --git a/Cargo.lock b/Cargo.lock index 66c8d7a..c63c812 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -207,9 +207,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "ar_archive_writer" @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.13.11" +version = "0.13.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "340e0f6bf7f9ee78549c61454f1460a3ed97c011902ee76b58301bbc6d502a32" +checksum = "281e6645758940dee594495e28807a7672ce40f11ebf4df6c22c4fcd59e2689f" dependencies = [ "enumflags2", "futures-channel", @@ -717,12 +717,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.12.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" +checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79" dependencies = [ "memchr", - "serde", + "serde_core", ] [[package]] @@ -2185,7 +2185,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/gpui-ce/gpui-ce#c17b4367d59f23b7d74cd612b91dbc064e5f2a6e" +source = "git+https://github.com/gpui-ce/gpui-ce#ce08af96db6c3474ab3b388325cdd1a7c3de06d9" dependencies = [ "accesskit", "anyhow", @@ -2266,7 +2266,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/gpui-ce/gpui-ce#c17b4367d59f23b7d74cd612b91dbc064e5f2a6e" +source = "git+https://github.com/gpui-ce/gpui-ce#ce08af96db6c3474ab3b388325cdd1a7c3de06d9" dependencies = [ "accesskit", "accesskit_unix", @@ -2316,7 +2316,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/gpui-ce/gpui-ce#c17b4367d59f23b7d74cd612b91dbc064e5f2a6e" +source = "git+https://github.com/gpui-ce/gpui-ce#ce08af96db6c3474ab3b388325cdd1a7c3de06d9" dependencies = [ "accesskit", "accesskit_macos", @@ -2361,7 +2361,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/gpui-ce/gpui-ce#c17b4367d59f23b7d74cd612b91dbc064e5f2a6e" +source = "git+https://github.com/gpui-ce/gpui-ce#ce08af96db6c3474ab3b388325cdd1a7c3de06d9" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2372,7 +2372,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/gpui-ce/gpui-ce#c17b4367d59f23b7d74cd612b91dbc064e5f2a6e" +source = "git+https://github.com/gpui-ce/gpui-ce#ce08af96db6c3474ab3b388325cdd1a7c3de06d9" dependencies = [ "console_error_panic_hook", "gpui", @@ -2385,7 +2385,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/gpui-ce/gpui-ce#c17b4367d59f23b7d74cd612b91dbc064e5f2a6e" +source = "git+https://github.com/gpui-ce/gpui-ce#ce08af96db6c3474ab3b388325cdd1a7c3de06d9" dependencies = [ "schemars", "serde", @@ -2404,7 +2404,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/gpui-ce/gpui-ce#c17b4367d59f23b7d74cd612b91dbc064e5f2a6e" +source = "git+https://github.com/gpui-ce/gpui-ce#ce08af96db6c3474ab3b388325cdd1a7c3de06d9" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2427,7 +2427,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/gpui-ce/gpui-ce#c17b4367d59f23b7d74cd612b91dbc064e5f2a6e" +source = "git+https://github.com/gpui-ce/gpui-ce#ce08af96db6c3474ab3b388325cdd1a7c3de06d9" dependencies = [ "anyhow", "bytemuck", @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/gpui-ce/gpui-ce#c17b4367d59f23b7d74cd612b91dbc064e5f2a6e" +source = "git+https://github.com/gpui-ce/gpui-ce#ce08af96db6c3474ab3b388325cdd1a7c3de06d9" dependencies = [ "accesskit", "accesskit_windows", @@ -2465,6 +2465,7 @@ dependencies = [ "etagere", "futures", "gpui", + "gpui_wgpu", "image", "itertools 0.14.0", "log", @@ -2964,9 +2965,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.102" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31" +checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" dependencies = [ "cfg-if", "futures-util", @@ -3902,13 +3903,12 @@ dependencies = [ [[package]] name = "open" -version = "5.3.5" +version = "5.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fbaa89d2ddc8473c78a3adf69eea8cffa28c483b8e02a971ef31527cd0fc92c" +checksum = "cd8d3b65c44123a56e0133d2cd06ce4361bd3ca99d41198b2f25e3c3db9b8b4a" dependencies = [ "is-wsl", "libc", - "pathdiff", ] [[package]] @@ -3977,12 +3977,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" -[[package]] -name = "pathdiff" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" - [[package]] name = "pathfinder_geometry" version = "0.5.1" @@ -5953,9 +5947,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.23.3" +version = "1.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7" +checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -6076,9 +6070,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.125" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a" +checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" dependencies = [ "cfg-if", "once_cell", @@ -6089,9 +6083,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.75" +version = "0.4.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280" +checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d" dependencies = [ "js-sys", "wasm-bindgen", @@ -6099,9 +6093,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.125" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d" +checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6109,9 +6103,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.125" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd" +checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" dependencies = [ "bumpalo", "proc-macro2", @@ -6122,9 +6116,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.125" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f" +checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" dependencies = [ "unicode-ident", ] @@ -6229,9 +6223,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.102" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d" +checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 6a6372a..9fc05f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2024" [dependencies] -gpui = { git = "https://github.com/gpui-ce/gpui-ce", version = "0.2.2" } -gpui_platform = { git = "https://github.com/gpui-ce/gpui-ce", version = "0.1.0", features = ["x11", "runtime_shaders", "font-kit"] } +gpui = { git = "https://github.com/gpui-ce/gpui-ce", version = "0.2.2", default-features = false, features = ["font-kit", "x11", "wayland"] } +gpui_platform = { git = "https://github.com/gpui-ce/gpui-ce", version = "0.1.0", default-features = false, features = ["x11", "wayland", "runtime_shaders", "font-kit", "wgpu"] } rodio = { version = "0.22.2", default-features = false, features = ["playback"] } [profile.dev.package."*"] diff --git a/flake.lock b/flake.lock index 82d8ab7..6492c26 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1782723713, + "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b14dd7e..59923e4 100644 --- a/flake.nix +++ b/flake.nix @@ -24,16 +24,18 @@ rust-analyzer rustfmt cargo - clippy + clippy ]; buildInputs = [ vulkan-loader - libGL + libGL ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib wayland + libxcb + fontconfig libxkbcommon ];