mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-06-17 21:54:07 +02:00
Danny Milosavljevic
2c51b803e3
* gnu/packages/patches/zed-0.225.10-add-guix-container-support.patch: New file. * gnu/packages/patches/zed-0.225.10-collapse-multiline-git-deps.patch: New file. * gnu/packages/patches/zed-0.225.10-disable-dlopen.patch: New file. * gnu/packages/patches/zed-0.225.10-exclude-libwebrtc-from-audio.patch: New file. * gnu/packages/patches/zed-0.225.10-fix-sqlite-memory-mode.patch: New file. * gnu/packages/patches/zed-0.225.10-fix-test-db-isolation.patch: New file. * gnu/packages/patches/zed-0.225.10-fix-workspace-race.patch: New file. * gnu/packages/patches/zed-0.225.10-keep-regular-file-workspaces.patch: New file. * gnu/packages/patches/zed-0.225.10-remove-patch-crates-io.patch: New file. * gnu/packages/patches/zed-0.225.10-use-mock-livekit-on-linux.patch: New file. * gnu/packages/patches/rust-candle-0.9.1-add-candle-onnx-to-workspace.patch: New file. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/rust-sources.scm (rust-alacritty-0.25.1.9d9640d, rust-candle-0.9.1.724d75e, rust-dap-types-0.0.1.1b461b3, rust-gh-workflow-0.8.0.c9eac0e, rust-livekit-0.7.8.5f04705, rust-notify-8.2.0.ce58c24, rust-pet-0.1.0.d5b5bb0, rust-tiktoken-rs-0.9.1.2570c43, rust-zed-xim-0.4.0-zed.16f35a2): New variables. * gnu/packages/rust-crates.scm (lookup-cargo-inputs): Modify. * gnu/packages/text-editors.scm (zed): New variable. Change-Id: I16d4c5431e3398261ac4eb74483747c09cf74449
32 lines
1.7 KiB
Diff
32 lines
1.7 KiB
Diff
Author: Danny Milosavljevic <dannym@friendly-machines.com>
|
|
Subject: Disable dlopen for wayland-backend and fontconfig in gpui.
|
|
Date: 2026-03-01
|
|
License: ASL2.0
|
|
|
|
Remove the "dlopen" feature from wayland-backend and the
|
|
"source-fontconfig-dlopen" feature from zed-font-kit so that libwayland
|
|
and libfontconfig are linked directly rather than loaded at runtime via
|
|
dlopen. This ensures these dependencies are visible to the package
|
|
manager and avoids runtime failures when the libraries are not in the
|
|
dlopen search path.
|
|
|
|
--- a/crates/gpui/Cargo.toml 2026-03-01 21:21:38.661240897 +0000
|
|
+++ b/crates/gpui/Cargo.toml 2026-03-01 21:23:00.282205935 +0000
|
|
@@ -167,7 +167,7 @@
|
|
cosmic-text = { version = "0.17.0", optional = true }
|
|
swash = { version = "0.2.6" }
|
|
# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
|
|
-font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", features = ["source-fontconfig-dlopen"], optional = true }
|
|
+font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
|
|
calloop = "0.14.3"
|
|
filedescriptor = { version = "0.8.2", optional = true }
|
|
open = { version = "5.2.0", optional = true }
|
|
@@ -177,7 +177,6 @@
|
|
calloop-wayland-source = { version = "0.4.1", optional = true }
|
|
wayland-backend = { version = "0.3.3", features = [
|
|
"client_system",
|
|
- "dlopen",
|
|
], optional = true }
|
|
wayland-client = { version = "0.31.11", optional = true }
|
|
wayland-cursor = { version = "0.31.11", optional = true }
|