Skip to content

Commit b20d73d

Browse files
feat: bump ayugram to v5.12.3 (#54)
# Flake.lock update ## Changelog - Update flake.lock with flake at 53bb668 --------- Signed-off-by: kaeeraa <kaeeraa@nebula-nook.ru> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 53bb668 commit b20d73d

File tree

5 files changed

+33
-7
lines changed

5 files changed

+33
-7
lines changed

default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
unwrapped ? callPackage ./unwrapped.nix {
1919
inherit stdenv;
20-
isDebug = isDebug;
20+
inherit isDebug;
2121
},
2222
}:
2323
stdenv.mkDerivation (finalAttrs: {

flake.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/tg_owt.nix

+6
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ stdenv.mkDerivation {
4343
fetchSubmodules = true;
4444
};
4545

46+
patches = [
47+
# Fix build with Pipewire 1.4
48+
# Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500
49+
../patch/tg_owt-pipewire-1.4.patch
50+
];
51+
4652
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
4753
substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
4854
--replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \

patch/tg_owt-pipewire-1.4.patch

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- a/src/modules/video_capture/linux/pipewire_session.cc
2+
+++ b/src/modules/video_capture/linux/pipewire_session.cc
3+
@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,
4+
.param = OnNodeParam,
5+
};
6+
7+
- pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
8+
+ pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
9+
}
10+
11+
// static
12+
@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) {
13+
uint32_t id = info->params[i].id;
14+
if (id == SPA_PARAM_EnumFormat &&
15+
info->params[i].flags & SPA_PARAM_INFO_READ) {
16+
- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
17+
+ pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
18+
break;
19+
}
20+
}

unwrapped.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@
4242

4343
stdenv.mkDerivation (finalAttrs: {
4444
pname = "ayugram-desktop-unwrapped";
45-
version = "5.11.1";
45+
version = "5.12.3";
4646

4747
src = fetchFromGitHub {
4848
owner = "AyuGram";
4949
repo = "AyuGramDesktop";
5050
rev = "v${finalAttrs.version}";
5151

5252
fetchSubmodules = true;
53-
hash = "sha256-AiMPbcEvbyhGd1V9mg95Q+mLrBH0DqTEFpC3D9ziCy8=";
53+
hash = "sha256-Zjik+9J0YtabVW1VEkJr/Bl3SIakVQ8EiTLYm28rEIk=";
5454
};
5555

5656
patches = [
57-
./patch/cstring.patch
5857
# Fixes linux builds
58+
./patch/cstring.patch
5959
(fetchpatch {
6060
url = "https://github.com/AyuGram/AyuGramDesktop/pull/32/commits/15287ad6ed162c209d9772fc592e959d793f63b9.patch";
6161
hash = "sha256-3yt502TsytJtpBn8iSJySN+UAQQ23c1hYNPIFLSogVA=";

0 commit comments

Comments
 (0)