Merge pull request #244598 from NickCao/telegram-desktop (6fa0302d) · Commits · nix / nixpkgs

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

+31 −10

Original line number	Diff line number	Diff line
		{ 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,17 +77,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.1";

		src = fetchFromGitHub {
		owner = "telegramdesktop";
		repo = "tdesktop";
		rev = "v${version}";
		fetchSubmodules = true;
		hash = "sha256-DRVFngQ4geJx2/7pT1VJzkcBZnVGgDvcGGUr9r38gSU=";
		hash = "sha256-tWUdSFr93plCuQkA8SE+GZeAyZcYPUoFd0sIOyEuobs=";
		};

		patches = [
		@@ -94,13 +122,6 @@ stdenv.mkDerivation rec {
		url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch";
		hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y=";
		})
		# lib_base: Add missing include for Qt 6.6
		(fetchpatch {
		url = "https://github.com/desktop-app/lib_base/commit/5ca91dbb811c84591780236abc31431e313faf39.patch";
		stripLen = 1;
		extraPrefix = "Telegram/lib_base/";
		hash = "sha256-eZkyMnPaAmUFYXiCmPhLRTw2Xdx0lylY+UVOckCsiaA=";
		})
		];

		postPatch = ''
		@@ -150,7 +171,7 @@ stdenv.mkDerivation rec {
		range-v3
		tl-expected
		hunspell
		glibmm_2_68
		glibmm
		webkitgtk_6_0
		jemalloc
		rnnoise

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -9,13 +9,13 @@

		stdenv.mkDerivation {
		pname = "tg_owt";
		version = "unstable-2023-08-15";
		version = "unstable-2023-10-17";

		src = fetchFromGitHub {
		owner = "desktop-app";
		repo = "tg_owt";
		rev = "0532942ac6176a66ef184fb728a4cbb02958fc0b";
		sha256 = "sha256-FcRXxu0Nc8qHQl8PoA92MeuhpV+vgl658uILEpmDy3A=";
		rev = "be153adaa363b2b13242466ad5b7b87f61301639";
		sha256 = "sha256-/hZNMV+IG00YzxH66Gh/BW9JdGFfsfnM93eD6oB3tlI=";
		fetchSubmodules = true;
		};

pkgs/development/libraries/mm-common/default.nix

+11 −1

Original line number	Diff line number	Diff line
		{ lib, stdenv
		{ lib
		, stdenv
		, fetchurl
		, bash
		, gnome
		, meson
		, python3
		@@ -15,12 +17,20 @@ stdenv.mkDerivation rec {
		sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao=";
		};

		strictDeps = true;

		nativeBuildInputs = [
		meson
		python3
		ninja
		];

		# for shebangs
		buildInputs = [
		python3
		bash
		];

		passthru = {
		updateScript = gnome.updateScript {
		packageName = pname;