Skip to content

Commit 0edd458

Browse files
committed
telegram-desktop: Switch to regular glibmm
It is now up to date.
1 parent 8182c92 commit 0edd458

1 file changed

Lines changed: 1 addition & 29 deletions

File tree

  • pkgs/applications/networking/instant-messengers/telegram/telegram-desktop

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{ lib
22
, fetchFromGitHub
3-
, fetchurl
43
, fetchpatch
5-
, fetchpatch2
64
, callPackage
75
, pkg-config
86
, cmake
@@ -28,7 +26,6 @@
2826
, libopus
2927
, alsa-lib
3028
, libpulseaudio
31-
, perlPackages
3229
, pipewire
3330
, range-v3
3431
, tl-expected
@@ -57,7 +54,6 @@
5754
, libpsl
5855
, brotli
5956
, microsoft-gsl
60-
, mm-common
6157
, rlottie
6258
, stdenv
6359
, darwin
@@ -80,30 +76,6 @@ let
8076
cxxStandard = "20";
8177
};
8278
};
83-
glibmm = glibmm_2_68.overrideAttrs (attrs: {
84-
version = "2.78.0";
85-
src = fetchurl {
86-
url = "mirror://gnome/sources/glibmm/2.78/glibmm-2.78.0.tar.xz";
87-
hash = "sha256-XS6HJWSZbwKgbYu6w2d+fDlK+LAN0VJq69R6+EKj71A=";
88-
};
89-
patches = [
90-
# Revert "Glib, Gio: Add new API from glib 2.77.0"
91-
(fetchpatch2 {
92-
url = "https://github.com/GNOME/glibmm/commit/5b9032c0298cbb49c3ed90d5f71f2636751fa638.patch";
93-
revert = true;
94-
hash = "sha256-UzrzIOnXh9pxuTDQsp6mnunDNNtc86hE9tCe1NgKsyo=";
95-
})
96-
];
97-
mesonFlags = [
98-
"-Dmaintainer-mode=true"
99-
"-Dbuild-documentation=false"
100-
];
101-
nativeBuildInputs = attrs.nativeBuildInputs ++ [
102-
mm-common
103-
perlPackages.perl
104-
perlPackages.XMLParser
105-
];
106-
});
10779
mainProgram = if stdenv.isLinux then "telegram-desktop" else "Telegram";
10880
in
10981
stdenv.mkDerivation rec {
@@ -185,7 +157,7 @@ stdenv.mkDerivation rec {
185157
libpulseaudio
186158
pipewire
187159
hunspell
188-
glibmm
160+
glibmm_2_68
189161
webkitgtk_6_0
190162
jemalloc
191163
# Transitive dependencies:

0 commit comments

Comments
 (0)