From 7be28fd81da6a6d9a16b137593db62be4b074eab Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Wed, 8 Oct 2025 01:08:58 +0530 Subject: [PATCH] chore: static link vulkan --- Cargo.lock | 45 ++++++++++++++++++++++++++++++--------------- Cargo.toml | 3 ++- flake.nix | 8 ++++---- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd1ab81..0300cf5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -182,6 +182,9 @@ dependencies = [ "serde", "serde_repr", "url", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.9", "zbus", ] @@ -2161,7 +2164,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "anyhow", "ashpd 0.11.0", @@ -2228,7 +2231,7 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-cursor", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-protocols-plasma", "windows", "windows-core", @@ -2250,7 +2253,7 @@ dependencies = [ [[package]] name = "gpui-macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3138,6 +3141,7 @@ dependencies = [ name = "mm" version = "0.1.0" dependencies = [ + "ash", "clap", "clap_complete", "error-stack", @@ -6030,6 +6034,18 @@ dependencies = [ "wayland-scanner", ] +[[package]] +name = "wayland-protocols" +version = "0.32.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901" +dependencies = [ + "bitflags 2.9.4", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + [[package]] name = "wayland-protocols-plasma" version = "0.2.0" @@ -6039,7 +6055,7 @@ dependencies = [ "bitflags 2.9.4", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-scanner", ] @@ -6062,7 +6078,6 @@ checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142" dependencies = [ "dlib", "log", - "once_cell", "pkg-config", ] @@ -6719,7 +6734,7 @@ dependencies = [ [[package]] name = "zed-collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "indexmap", "rustc-hash 2.1.1", @@ -6729,7 +6744,7 @@ dependencies = [ [[package]] name = "zed-derive-refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "proc-macro2", "quote", @@ -6764,7 +6779,7 @@ dependencies = [ [[package]] name = "zed-http-client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "anyhow", "async-compression", @@ -6790,7 +6805,7 @@ dependencies = [ [[package]] name = "zed-media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "anyhow", "bindgen", @@ -6806,7 +6821,7 @@ dependencies = [ [[package]] name = "zed-perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "serde", "serde_json", @@ -6817,7 +6832,7 @@ dependencies = [ [[package]] name = "zed-refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "workspace-hack", "zed-derive-refineable", @@ -6875,7 +6890,7 @@ dependencies = [ [[package]] name = "zed-semantic-version" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "anyhow", "serde", @@ -6885,7 +6900,7 @@ dependencies = [ [[package]] name = "zed-sum-tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "arrayvec", "log", @@ -6896,7 +6911,7 @@ dependencies = [ [[package]] name = "zed-util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "anyhow", "async-fs", @@ -6932,7 +6947,7 @@ dependencies = [ [[package]] name = "zed-util-macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#94f1faffa73c17d22a949de77309c664918e3547" +source = "git+https://github.com/uttarayan21/zed#0206e34dde1fe54af1b86d46793be3fa72b37388" dependencies = [ "quote", "syn 2.0.106", diff --git a/Cargo.toml b/Cargo.toml index 5fc71c3..057d116 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,9 +14,10 @@ thiserror = "2.0" tokio = "1.43.1" tracing = "0.1" tracing-subscriber = "0.3" -gpui = { git = "https://github.com/zed-industries/zed", default-features = false, features = ["wayland"] } +gpui = { git = "https://github.com/uttarayan21/zed", default-features = false, features = ["wayland"] } nalgebra = "0.34.1" wayland-sys = { version = "0.31.7", default-features = false } wayland-backend = { version = "0.3.11", default-features = false } ignore = { version = "0.4.23", features = ["simd-accel"] } unicode-segmentation = "1.12.0" +ash = { version = "0.38.0", features = ["linked"] } diff --git a/flake.nix b/flake.nix index c971cf3..efaa24b 100644 --- a/flake.nix +++ b/flake.nix @@ -153,10 +153,10 @@ ++ (lib.optionals pkgs.stdenv.isDarwin [ apple-sdk_13 ]); - shellHook = '' - # Temp solution until I can disable wayland-backend's dlopen feature in gpui itself - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${builtins.toString (pkgs.lib.makeLibraryPath commonArgs.buildInputs)}"; - ''; + # shellHook = '' + # # Temp solution until I can disable wayland-backend's dlopen feature in gpui itself + # export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${builtins.toString (pkgs.lib.makeLibraryPath commonArgs.buildInputs)}"; + # ''; }); }; }