Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zed-editor: 0.165.4 -> 0.166.1 #356757

Merged
merged 4 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24034,6 +24034,12 @@
githubId = 49368953;
keys = [ { fingerprint = "D20F C904 A145 8B28 53D8 FBA0 0422 0096 01E4 87FC"; } ];
};
WeetHet = {
name = "WeetHet";
matrix = "@weethet:catgirl.cloud";
github = "WeetHet";
githubId = 43210583;
};
wegank = {
name = "Weijia Wang";
email = "[email protected]";
Expand Down
15 changes: 15 additions & 0 deletions pkgs/by-name/li/livekit-libwebrtc/0001-shared-libraries.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/BUILD.gn b/BUILD.gn
index d5289b8..598bbbc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -138,8 +138,8 @@ config("library_impl_config") {
# target_defaults and direct_dependent_settings.
config("common_inherited_config") {
defines = []
- cflags = []
- ldflags = []
+ cflags = [ "-fvisibility=default" ]
+ ldflags = [ "-lavutil", "-lavformat", "-lavcodec" ]

if (rtc_dlog_always_on) {
defines += [ "DLOG_ALWAYS_ON" ]
61 changes: 61 additions & 0 deletions pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
flit-core,
click,
nurl,
nix-prefetch-git,
nix,
coreutils,
nixfmt-rfc-style,
makeWrapper,
}:
# Based on https://github.com/milahu/gclient2nix
# but with libwebrtc-specific changes.
let
nativeDeps = [
nurl
nix-prefetch-git
nix
coreutils
nixfmt-rfc-style
];
in
buildPythonPackage {
pname = "gclient2nix";
version = "0.2.0-unstable-2024-12-19";
pyproject = true;

src = fetchFromGitHub {
owner = "WeetHet";
repo = "gclient2nix";
rev = "bdf5ab79818595be9dcfc655bd6784cf4bcdb863";
hash = "sha256-KOXG8E2g30XyZGmM4ZnYPBSybBhHIjOZL8ZXRKYrkZQ=";
};

build-system = [
flit-core
];

dependencies = [
click
];

nativeBuildInputs = [ makeWrapper ];

postFixup = ''
wrapProgram $out/bin/gclient2nix \
--set PATH ${lib.makeBinPath nativeDeps}
'';

meta = {
description = "Generate Nix expressions for projects based on the Google build tools";
homepage = "https://github.com/WeetHet/gclient2nix";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
WeetHet
];
mainProgram = "gclient2nix";
};
}
64 changes: 64 additions & 0 deletions pkgs/by-name/li/livekit-libwebrtc/mkSystemLibraries.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
brotli,
fontconfig,
freetype,
harfbuzz,
icu,
jsoncpp,
libpng,
libwebp,
libxml2,
libxslt,
minizip,
ffmpeg_6,
}:
{
"brotli" = {
package = brotli;
path = "third_party/brotli/BUILD.gn";
};
"fontconfig" = {
package = fontconfig;
path = "third_party/fontconfig/BUILD.gn";
};
"freetype" = {
package = freetype;
path = "build/config/freetype/freetype.gni";
};
"harfbuzz-ng" = {
package = harfbuzz;
path = "third_party/harfbuzz-ng/harfbuzz.gni";
};
"jsoncpp" = {
package = jsoncpp;
path = "third_party/jsoncpp/BUILD.gn";
};
"icu" = {
package = icu;
path = "third_party/icu/BUILD.gn";
};
"libpng" = {
package = libpng;
path = "third_party/libpng/BUILD.gn";
};
"libwebp" = {
package = libwebp;
path = "third_party/libwebp/BUILD.gn";
};
"libxml" = {
package = libxml2;
path = "third_party/libxml/BUILD.gn";
};
"libxslt" = {
package = libxslt;
path = "third_party/libxslt/BUILD.gn";
};
"zlib" = {
package = minizip;
path = "third_party/zlib/BUILD.gn";
};
"ffmpeg" = {
package = ffmpeg_6;
path = "third_party/ffmpeg/BUILD.gn";
};
}
Loading
Loading