[Backport release-24.05] telegram-desktop: 5.1.7 -> 5.6.3, _64gram: 1.1.22 -> 1.1.43

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

@@ -1,6 +1,5 @@
 { lib
 , fetchFromGitHub
-, fetchpatch
 , callPackage
 , pkg-config
 , cmake
@@ -15,6 +14,7 @@
 , qtsvg
 , qtimageformats
 , gtk3
+, glib-networking
 , boost
 , fmt
 , libdbusmenu
@@ -38,6 +38,7 @@
 , xdg-utils
 , microsoft-gsl
 , rlottie
+, ada
 , stdenv
 , darwin
 , lld
@@ -59,29 +60,25 @@ let
       cxxStandard = "20";
     };
   };
-  mainProgram = if stdenv.isLinux then "telegram-desktop" else "Telegram";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop";
-  version = "5.1.7";
+  version = "5.6.3";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-OH9+cH5CQyrp4DSKXEMs6csGiH+GAtxJT4P9YidmAcM=";
+    hash = "sha256-frz425V5eRulNVxCf457TWQAzU/f9/szD/sx3/LYQ2Y=";
   };
 
   patches = [
     ./macos.patch
     # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling
     # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary
     # see https://github.com/NixOS/nixpkgs/issues/218370
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch";
-      hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y=";
-    })
+    ./scheme.patch
   ];
 
   postPatch = lib.optionalString stdenv.isLinux ''
@@ -134,9 +131,11 @@ stdenv.mkDerivation rec {
     tg_owt
     microsoft-gsl
     rlottie
+    ada
   ] ++ lib.optionals stdenv.isLinux [
     qtwayland
     gtk3
+    glib-networking
     fmt
     libdbusmenu
     alsa-lib
@@ -177,6 +176,7 @@ stdenv.mkDerivation rec {
     IOSurface
     Metal
     NaturalLanguage
+    LocalAuthentication
     libicns
   ]);
 
@@ -185,13 +185,12 @@ stdenv.mkDerivation rec {
   };
 
   cmakeFlags = [
-    "-Ddisable_autoupdate=ON"
+    (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true)
     # We're allowed to used the API ID of the Snap package:
-    "-DTDESKTOP_API_ID=611335"
-    "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
+    (lib.cmakeFeature "TDESKTOP_API_ID" "611335")
+    (lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c")
     # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649
-    "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
-    "-DDESKTOP_APP_DISABLE_SCUDO=ON"
+    (lib.cmakeBool "DESKTOP_APP_USE_PACKAGED_FONTS" false)
   ];
 
   preBuild = ''
@@ -201,37 +200,37 @@ stdenv.mkDerivation rec {
 
   installPhase = lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/Applications
-    cp -r ${mainProgram}.app $out/Applications
-    ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}
+    cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications
+    ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin}
   '';
 
   postFixup = lib.optionalString stdenv.isLinux ''
     # This is necessary to run Telegram in a pure environment.
     # We also use gappsWrapperArgs from wrapGAppsHook.
-    wrapProgram $out/bin/${mainProgram} \
+    wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \
       "''${gappsWrapperArgs[@]}" \
       "''${qtWrapperArgs[@]}" \
       --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
   '' + lib.optionalString stdenv.isDarwin ''
-    wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram}
+    wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram}
   '';
 
   passthru = {
     inherit tg_owt;
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Telegram Desktop messaging app";
     longDescription = ''
       Desktop client for the Telegram messenger, based on the Telegram API and
       the MTProto secure protocol.
     '';
-    license = licenses.gpl3Only;
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
     homepage = "https://desktop.telegram.org/";
-    changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}";
-    maintainers = with maintainers; [ nickcao ];
-    inherit mainProgram;
+    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";
   };
-}
+})

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch

@@ -0,0 +1,12 @@
+diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
+index e3e0de6c6..d5851bd6e 100644
+--- a/Telegram/SourceFiles/core/application.cpp
++++ b/Telegram/SourceFiles/core/application.cpp
+@@ -421,7 +421,6 @@ void Application::run() {
+
+ void Application::autoRegisterUrlScheme() {
+ 	if (!OptionSkipUrlSchemeRegister.value()) {
+-		InvokeQueued(this, [] { RegisterUrlScheme(); });
+ 	}
+ }
+

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

@@ -1,79 +1,117 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch
-, pkg-config, cmake, ninja, yasm
-, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
-, openh264, usrsctp, libevent, libvpx
-, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
-, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
-, mesa, libepoxy, libglvnd, unstableGitUpdater, darwin
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  cmake,
+  crc32c,
+  python3,
+  libjpeg,
+  openssl,
+  libopus,
+  ffmpeg,
+  openh264,
+  libvpx,
+  libXi,
+  libXfixes,
+  libXtst,
+  libXcomposite,
+  libXdamage,
+  libXext,
+  libXrender,
+  libXrandr,
+  glib,
+  abseil-cpp,
+  pipewire,
+  mesa,
+  libGL,
+  unstableGitUpdater,
+  darwin,
 }:
 
 stdenv.mkDerivation {
   pname = "tg_owt";
-  version = "0-unstable-2023-12-21";
+  version = "0-unstable-2024-08-04";
 
   src = fetchFromGitHub {
     owner = "desktop-app";
     repo = "tg_owt";
-    rev = "afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60";
-    sha256 = "sha256-/1cghoxmm+6uFEUgCjh1Xhb0CTnd1XAq1M21FruDRek=";
+    rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8";
+    sha256 = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o=";
     fetchSubmodules = true;
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
-  nativeBuildInputs = [ pkg-config cmake ninja yasm ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    python3
+  ];
 
-  buildInputs = [
-    libjpeg libopus ffmpeg protobuf openh264 usrsctp libevent libvpx abseil-cpp
-  ] ++ lib.optionals stdenv.isLinux [
-    libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi
-    glib pcre util-linuxMinimal libselinux libsepol pipewire alsa-lib libpulseaudio
-    mesa libepoxy libglvnd
-  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-    Cocoa
-    AppKit
-    IOKit
-    IOSurface
-    Foundation
-    AVFoundation
-    CoreMedia
-    VideoToolbox
-    CoreGraphics
-    CoreVideo
-    OpenGL
-    Metal
-    MetalKit
-    CoreFoundation
-    ApplicationServices
-  ]);
+  buildInputs =
+    [
+      openssl
+      libjpeg
+      libopus
+      ffmpeg
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      glib
+      libXi
+      libXcomposite
+      libXdamage
+      libXext
+      libXfixes
+      libXrender
+      libXrandr
+      libXtst
+      pipewire
+      mesa
+      libGL
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        Cocoa
+        AppKit
+        IOKit
+        IOSurface
+        Foundation
+        AVFoundation
+        CoreMedia
+        VideoToolbox
+        CoreGraphics
+        CoreVideo
+        Metal
+        MetalKit
+        CoreFoundation
+        ApplicationServices
+      ]
+    );
 
-  patches = [
-    # GCC 12 Fix
-    (fetchpatch {
-      url = "https://github.com/desktop-app/tg_owt/pull/101/commits/86d2bcd7afb8706663d29e30f65863de5a626142.patch";
-      hash = "sha256-iWS0mB8R0vqPU/0qf6Ax54UCAKYDVCPac2mi/VHbFm0=";
-    })
-    # additional fix for GCC 12 + musl
-    (fetchpatch {
-      url = "https://git.alpinelinux.org/aports/plain/community/tg_owt/gcc12.patch?id=8120df03fa3b6db5b8ff92c7a52b680290ad6e20";
-      hash = "sha256-ikgxUH1e7pz0n0pKUemrPXXa4UkECX+w467M9gU68zs=";
-    })
+  propagatedBuildInputs = [
+    abseil-cpp
+    crc32c
+    openh264
+    libvpx
   ];
 
   cmakeFlags = [
     # Building as a shared library isn't officially supported and may break at any time.
-    "-DBUILD_SHARED_LIBS=OFF"
-  ];
-
-  propagatedBuildInputs = [
-    # Required for linking downstream binaries.
-    abseil-cpp openh264 usrsctp libevent libvpx openssl
+    (lib.cmakeBool "BUILD_SHARED_LIBS" false)
   ];
 
   passthru.updateScript = unstableGitUpdater { };
 
-  meta = with lib; {
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ oxalica ];
+  meta = {
+    description = "Fork of Google's webrtc library for telegram-desktop";
+    homepage = "https://github.com/desktop-app/tg_owt";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ oxalica ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

pkgs/by-name/_6/_64gram/package.nix

@@ -1,23 +1,36 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , telegram-desktop
 , nix-update-script
 }:
 
 telegram-desktop.overrideAttrs (old: rec {
   pname = "64gram";
-  version = "1.1.22";
+  version = "1.1.43";
 
   src = fetchFromGitHub {
     owner = "TDesktop-x64";
     repo = "tdesktop";
     rev = "v${version}";
 
     fetchSubmodules = true;
-    hash = "sha256-Fhix+kCqUTr9qGMzDc2undxmhjmM6fPorZebeqXNHHE=";
+    hash = "sha256-vRiAIGY3CU5+hsdn8xiNbgvSM3eGRVwnvsSmSoaDN/k=";
   };
 
+  patches = (old.patches or []) ++ [
+    (fetchpatch {
+      url = "https://github.com/TDesktop-x64/tdesktop/commit/c996ccc1561aed089c8b596f6ab3844335bbf1df.patch";
+      revert = true;
+      hash = "sha256-Hz7BXl5z4owe31l9Je3QOXT8FAyKcbsXsKjGfCmXhzE=";
+    })
+  ];
+
+  cmakeFlags = (old.cmakeFlags or []) ++ [
+    (lib.cmakeBool "disable_autoupdate" true)
+  ];
+
   passthru.updateScript = nix-update-script {};
 
   meta = with lib; {