Unverified Commit ad47117c authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

telegram-desktop: 5.14.3 -> 5.15.2 (#414062)

parents 96e7f536 2d4fc12f

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
--- a/src/modules/video_capture/linux/pipewire_session.cc

+++ b/src/modules/video_capture/linux/pipewire_session.cc

@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,

       .param = OnNodeParam,

   };

 

-  pw_node_add_listener(proxy_, &node_listener_, &node_events, this);

+  pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);

 }

 

 // static

@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) {

       uint32_t id = info->params[i].id;

       if (id == SPA_PARAM_EnumFormat &&

           info->params[i].flags & SPA_PARAM_INFO_READ) {

-        pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);

+        pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);

         break;

       }

     }

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

+3 −9
Original line number Diff line number Diff line
@@ -33,22 +33,16 @@ 


stdenv.mkDerivation {

  pname = "tg_owt";

  version = "0-unstable-2024-10-28";

  version = "0-unstable-2025-06-02";



  src = fetchFromGitHub {

    owner = "desktop-app";

    repo = "tg_owt";

    rev = "8198c4d8b91e22d68eb5c7327fd408e3b6abcc79";

    hash = "sha256-3sLa3Px0VWgRYqnnLlwLnx+WWnneqZyhQPrRMBriXQA=";

    rev = "62321fd7128ab2650b459d4195781af8185e46b5";

    hash = "sha256-l6EdHJLd42TU+4pLakdU3a5PLVxrxjta0CSRy5hVBFU=";

    fetchSubmodules = true;

  };



  patches = [

    # Fix build with Pipewire 1.4

    # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500

    ./tg_owt-pipewire-1.4.patch

  ];



  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

    substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \

      --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \

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

+18 −3
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ 
  python3,

  tdlib,

  tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; },

  libavif,

  libheif,

  libjxl,

  kimageformats,

  qtbase,

  qtimageformats,

  qtsvg,
@@ -47,14 +51,14 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "telegram-desktop-unwrapped";

  version = "5.14.3";

  version = "5.15.2";



  src = fetchFromGitHub {

    owner = "telegramdesktop";

    repo = "tdesktop";

    rev = "v${finalAttrs.version}";

    fetchSubmodules = true;

    hash = "sha256-nNYQpWbBK+E/LAbwTWpNUhs2+wb8iuMfqkxJKjaFmhg=";

    hash = "sha256-T+gzNY3jPfCWjV9yFEGlz8kNGeAioyDUD2qazM/j05I=";

  };



  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -98,6 +102,17 @@ stdenv.mkDerivation (finalAttrs: { 
      boost

      ada

      (tdlib.override { tde2eOnly = true; })

      # even though the last 3 dependencies are already in `kimageformats`,

      # because of a logic error in the cmake files, in td 5.15.{1,2} it

      # doesn't link when you don't add them explicitly

      #

      # this has been fixed

      # (https://github.com/desktop-app/cmake_helpers/pull/413), remove next

      # release

      kimageformats

      libavif

      libheif

      libjxl

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      protobuf
@@ -147,6 +162,6 @@ stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://desktop.telegram.org/";

    changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${finalAttrs.version}";

    maintainers = with lib.maintainers; [ nickcao ];

    mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram";

    mainProgram = "Telegram";

  };

})