zed-editor: 0.165.4 -> 0.166.1 (NixOS#356757)

SherfeyInv · Dec 20, 2024 · 019d66f · 019d66f
2 parents 7bbe2c8 + e1a0224
commit 019d66f
Show file tree

Hide file tree

Showing 8 changed files with 713 additions and 82 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -24072,6 +24072,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]";

diff --git a/pkgs/by-name/li/livekit-libwebrtc/0001-shared-libraries.patch b/pkgs/by-name/li/livekit-libwebrtc/0001-shared-libraries.patch
@@ -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" ]
diff --git a/pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix b/pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix
@@ -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";
+  };
+}
diff --git a/pkgs/by-name/li/livekit-libwebrtc/mkSystemLibraries.nix b/pkgs/by-name/li/livekit-libwebrtc/mkSystemLibraries.nix
@@ -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";
+  };
+}