pyrox.dev
Merge pull request #244598 from NickCao/telegram-desktop
telegram-desktop: 4.8.4 -> 4.11.1
+31
-10
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+31
-10
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
···
1
1
{ lib
2
2
, fetchFromGitHub
3
+
, fetchurl
3
4
, fetchpatch
5
+
, fetchpatch2
4
6
, callPackage
5
7
, pkg-config
6
8
, cmake
···
26
28
, libopus
27
29
, alsa-lib
28
30
, libpulseaudio
31
+
, perlPackages
29
32
, pipewire
30
33
, range-v3
31
34
, tl-expected
···
55
58
, libpsl
56
59
, brotli
57
60
, microsoft-gsl
61
+
, mm-common
58
62
, rlottie
59
63
, stdenv
60
64
, nix-update-script
···
73
77
cxxStandard = "20";
74
78
};
75
79
};
80
+
glibmm = glibmm_2_68.overrideAttrs (attrs: {
81
+
version = "2.78.0";
82
+
src = fetchurl {
83
+
url = "mirror://gnome/sources/glibmm/2.78/glibmm-2.78.0.tar.xz";
84
+
hash = "sha256-XS6HJWSZbwKgbYu6w2d+fDlK+LAN0VJq69R6+EKj71A=";
85
+
};
86
+
patches = [
87
+
# Revert "Glib, Gio: Add new API from glib 2.77.0"
88
+
(fetchpatch2 {
89
+
url = "https://github.com/GNOME/glibmm/commit/5b9032c0298cbb49c3ed90d5f71f2636751fa638.patch";
90
+
revert = true;
91
+
hash = "sha256-UzrzIOnXh9pxuTDQsp6mnunDNNtc86hE9tCe1NgKsyo=";
92
+
})
93
+
];
94
+
mesonFlags = [
95
+
"-Dmaintainer-mode=true"
96
+
"-Dbuild-documentation=false"
97
+
];
98
+
nativeBuildInputs = attrs.nativeBuildInputs ++ [
99
+
mm-common
100
+
perlPackages.perl
101
+
perlPackages.XMLParser
102
+
];
103
+
});
76
104
in
77
105
stdenv.mkDerivation rec {
78
106
pname = "telegram-desktop";
79
-
version = "4.8.4";
107
+
version = "4.11.1";
80
108
81
109
src = fetchFromGitHub {
82
110
owner = "telegramdesktop";
83
111
repo = "tdesktop";
84
112
rev = "v${version}";
85
113
fetchSubmodules = true;
86
-
hash = "sha256-DRVFngQ4geJx2/7pT1VJzkcBZnVGgDvcGGUr9r38gSU=";
114
+
hash = "sha256-tWUdSFr93plCuQkA8SE+GZeAyZcYPUoFd0sIOyEuobs=";
87
115
};
88
116
89
117
patches = [
···
93
121
(fetchpatch {
94
122
url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch";
95
123
hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y=";
96
-
})
97
-
# lib_base: Add missing include for Qt 6.6
98
-
(fetchpatch {
99
-
url = "https://github.com/desktop-app/lib_base/commit/5ca91dbb811c84591780236abc31431e313faf39.patch";
100
-
stripLen = 1;
101
-
extraPrefix = "Telegram/lib_base/";
102
-
hash = "sha256-eZkyMnPaAmUFYXiCmPhLRTw2Xdx0lylY+UVOckCsiaA=";
103
124
})
104
125
];
105
126
···
150
171
range-v3
151
172
tl-expected
152
173
hunspell
153
-
glibmm_2_68
174
+
glibmm
154
175
webkitgtk_6_0
155
176
jemalloc
156
177
rnnoise
+3
-3
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+3
-3
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
···
9
9
10
10
stdenv.mkDerivation {
11
11
pname = "tg_owt";
12
-
version = "unstable-2023-08-15";
12
+
version = "unstable-2023-10-17";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "desktop-app";
16
16
repo = "tg_owt";
17
-
rev = "0532942ac6176a66ef184fb728a4cbb02958fc0b";
18
-
sha256 = "sha256-FcRXxu0Nc8qHQl8PoA92MeuhpV+vgl658uILEpmDy3A=";
17
+
rev = "be153adaa363b2b13242466ad5b7b87f61301639";
18
+
sha256 = "sha256-/hZNMV+IG00YzxH66Gh/BW9JdGFfsfnM93eD6oB3tlI=";
19
19
fetchSubmodules = true;
20
20
};
21
21
+11
-1
pkgs/development/libraries/mm-common/default.nix
+11
-1
pkgs/development/libraries/mm-common/default.nix
···
1
-
{ lib, stdenv
1
+
{ lib
2
+
, stdenv
2
3
, fetchurl
4
+
, bash
3
5
, gnome
4
6
, meson
5
7
, python3
···
14
16
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
15
17
sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao=";
16
18
};
19
+
20
+
strictDeps = true;
17
21
18
22
nativeBuildInputs = [
19
23
meson
20
24
python3
21
25
ninja
26
+
];
27
+
28
+
# for shebangs
29
+
buildInputs = [
30
+
python3
31
+
bash
22
32
];
23
33
24
34
passthru = {