From 82bddde9da3434d680af6eccca0a936c14c41799 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 29 Oct 2023 09:42:12 -0400 Subject: [PATCH] telegram-desktop: override glibmm to 2.78.0 --- .../telegram/telegram-desktop/default.nix | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 02c9dd5b3fb8..cbfcad3ed4db 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -1,6 +1,8 @@ { lib , fetchFromGitHub +, fetchurl , fetchpatch +, fetchpatch2 , callPackage , pkg-config , cmake @@ -26,6 +28,7 @@ , libopus , alsa-lib , libpulseaudio +, perlPackages , pipewire , range-v3 , tl-expected @@ -55,6 +58,7 @@ , libpsl , brotli , microsoft-gsl +, mm-common , rlottie , stdenv , nix-update-script @@ -73,6 +77,30 @@ let cxxStandard = "20"; }; }; + glibmm = glibmm_2_68.overrideAttrs (attrs: { + version = "2.78.0"; + src = fetchurl { + url = "mirror://gnome/sources/glibmm/2.78/glibmm-2.78.0.tar.xz"; + hash = "sha256-XS6HJWSZbwKgbYu6w2d+fDlK+LAN0VJq69R6+EKj71A="; + }; + patches = [ + # Revert "Glib, Gio: Add new API from glib 2.77.0" + (fetchpatch2 { + url = "https://github.com/GNOME/glibmm/commit/5b9032c0298cbb49c3ed90d5f71f2636751fa638.patch"; + revert = true; + hash = "sha256-UzrzIOnXh9pxuTDQsp6mnunDNNtc86hE9tCe1NgKsyo="; + }) + ]; + mesonFlags = [ + "-Dmaintainer-mode=true" + "-Dbuild-documentation=false" + ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ + mm-common + perlPackages.perl + perlPackages.XMLParser + ]; + }); in stdenv.mkDerivation rec { pname = "telegram-desktop"; @@ -143,7 +171,7 @@ stdenv.mkDerivation rec { range-v3 tl-expected hunspell - glibmm_2_68 + glibmm webkitgtk_6_0 jemalloc rnnoise