diff options
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
3 files changed, 38 insertions, 12 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index b5879ffe5b4..694021d0f7f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -82,15 +82,15 @@ stdenv.mkDerivation { }) ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = '' + rm -r src/third_party/libsrtp + cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp + '' + lib.optionalString stdenv.isLinux '' substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \ --replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"' - - rm -r src/third_party/libsrtp - cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp ''; outputs = [ "out" "dev" ]; 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 7a7835ede42..e0d3a4171ca 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 @@ -50,11 +53,11 @@ , libthai , libdatrie , xdg-utils -, xorg , libsysprof-capture , libpsl , brotli , microsoft-gsl +, mm-common , rlottie , stdenv , nix-update-script @@ -73,17 +76,41 @@ 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"; - version = "4.8.4"; + version = "4.11.8"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-DRVFngQ4geJx2/7pT1VJzkcBZnVGgDvcGGUr9r38gSU="; + hash = "sha256-VuMcqbGo1t1J7I8kXdqsw/01Mth9YKEbiy8aNtM3azw="; }; patches = [ @@ -143,7 +170,7 @@ stdenv.mkDerivation rec { range-v3 tl-expected hunspell - glibmm_2_68 + glibmm webkitgtk_6_0 jemalloc rnnoise @@ -189,7 +216,6 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/telegram-desktop \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ - --prefix LD_LIBRARY_PATH : "${xorg.libXcursor}/lib" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 73437d73015..c26bebc8a89 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-08-15"; + version = "unstable-2023-11-01"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "0532942ac6176a66ef184fb728a4cbb02958fc0b"; - sha256 = "sha256-FcRXxu0Nc8qHQl8PoA92MeuhpV+vgl658uILEpmDy3A="; + rev = "71cce98c5fb1d9328892d55f70db711afd5b1aef"; + sha256 = "sha256-cEow6Hrp00nchfNtuABsLfD07KtlErWxh0NFv2uPQdQ="; fetchSubmodules = true; }; |