pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #244598 from NickCao/telegram-desktop

telegram-desktop: 4.8.4 -> 4.11.1

authored by Nick Cao and committed by GitHub 6fa0302d 4e43dd49

+45 -14
unified split
+31 -10
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
··· 1 { lib 2 , fetchFromGitHub 3 , fetchpatch 4 , callPackage 5 , pkg-config 6 , cmake ··· 26 , libopus 27 , alsa-lib 28 , libpulseaudio 29 , pipewire 30 , range-v3 31 , tl-expected ··· 55 , libpsl 56 , brotli 57 , microsoft-gsl 58 , rlottie 59 , stdenv 60 , nix-update-script ··· 73 cxxStandard = "20"; 74 }; 75 }; 76 in 77 stdenv.mkDerivation rec { 78 pname = "telegram-desktop"; 79 - version = "4.8.4"; 80 81 src = fetchFromGitHub { 82 owner = "telegramdesktop"; 83 repo = "tdesktop"; 84 rev = "v${version}"; 85 fetchSubmodules = true; 86 - hash = "sha256-DRVFngQ4geJx2/7pT1VJzkcBZnVGgDvcGGUr9r38gSU="; 87 }; 88 89 patches = [ ··· 93 (fetchpatch { 94 url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch"; 95 hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y="; 96 - }) 97 - # lib_base: Add missing include for Qt 6.6 98 - (fetchpatch { 99 - url = "https://github.com/desktop-app/lib_base/commit/5ca91dbb811c84591780236abc31431e313faf39.patch"; 100 - stripLen = 1; 101 - extraPrefix = "Telegram/lib_base/"; 102 - hash = "sha256-eZkyMnPaAmUFYXiCmPhLRTw2Xdx0lylY+UVOckCsiaA="; 103 }) 104 ]; 105 ··· 150 range-v3 151 tl-expected 152 hunspell 153 - glibmm_2_68 154 webkitgtk_6_0 155 jemalloc 156 rnnoise
··· 1 { lib 2 , fetchFromGitHub 3 + , fetchurl 4 , fetchpatch 5 + , fetchpatch2 6 , callPackage 7 , pkg-config 8 , cmake ··· 28 , libopus 29 , alsa-lib 30 , libpulseaudio 31 + , perlPackages 32 , pipewire 33 , range-v3 34 , tl-expected ··· 58 , libpsl 59 , brotli 60 , microsoft-gsl 61 + , mm-common 62 , rlottie 63 , stdenv 64 , nix-update-script ··· 77 cxxStandard = "20"; 78 }; 79 }; 80 + glibmm = glibmm_2_68.overrideAttrs (attrs: { 81 + version = "2.78.0"; 82 + src = fetchurl { 83 + url = "mirror://gnome/sources/glibmm/2.78/glibmm-2.78.0.tar.xz"; 84 + hash = "sha256-XS6HJWSZbwKgbYu6w2d+fDlK+LAN0VJq69R6+EKj71A="; 85 + }; 86 + patches = [ 87 + # Revert "Glib, Gio: Add new API from glib 2.77.0" 88 + (fetchpatch2 { 89 + url = "https://github.com/GNOME/glibmm/commit/5b9032c0298cbb49c3ed90d5f71f2636751fa638.patch"; 90 + revert = true; 91 + hash = "sha256-UzrzIOnXh9pxuTDQsp6mnunDNNtc86hE9tCe1NgKsyo="; 92 + }) 93 + ]; 94 + mesonFlags = [ 95 + "-Dmaintainer-mode=true" 96 + "-Dbuild-documentation=false" 97 + ]; 98 + nativeBuildInputs = attrs.nativeBuildInputs ++ [ 99 + mm-common 100 + perlPackages.perl 101 + perlPackages.XMLParser 102 + ]; 103 + }); 104 in 105 stdenv.mkDerivation rec { 106 pname = "telegram-desktop"; 107 + version = "4.11.1"; 108 109 src = fetchFromGitHub { 110 owner = "telegramdesktop"; 111 repo = "tdesktop"; 112 rev = "v${version}"; 113 fetchSubmodules = true; 114 + hash = "sha256-tWUdSFr93plCuQkA8SE+GZeAyZcYPUoFd0sIOyEuobs="; 115 }; 116 117 patches = [ ··· 121 (fetchpatch { 122 url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch"; 123 hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y="; 124 }) 125 ]; 126 ··· 171 range-v3 172 tl-expected 173 hunspell 174 + glibmm 175 webkitgtk_6_0 176 jemalloc 177 rnnoise
+3 -3
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
··· 9 10 stdenv.mkDerivation { 11 pname = "tg_owt"; 12 - version = "unstable-2023-08-15"; 13 14 src = fetchFromGitHub { 15 owner = "desktop-app"; 16 repo = "tg_owt"; 17 - rev = "0532942ac6176a66ef184fb728a4cbb02958fc0b"; 18 - sha256 = "sha256-FcRXxu0Nc8qHQl8PoA92MeuhpV+vgl658uILEpmDy3A="; 19 fetchSubmodules = true; 20 }; 21
··· 9 10 stdenv.mkDerivation { 11 pname = "tg_owt"; 12 + version = "unstable-2023-10-17"; 13 14 src = fetchFromGitHub { 15 owner = "desktop-app"; 16 repo = "tg_owt"; 17 + rev = "be153adaa363b2b13242466ad5b7b87f61301639"; 18 + sha256 = "sha256-/hZNMV+IG00YzxH66Gh/BW9JdGFfsfnM93eD6oB3tlI="; 19 fetchSubmodules = true; 20 }; 21
+11 -1
pkgs/development/libraries/mm-common/default.nix
··· 1 - { lib, stdenv 2 , fetchurl 3 , gnome 4 , meson 5 , python3 ··· 14 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 15 sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao="; 16 }; 17 18 nativeBuildInputs = [ 19 meson 20 python3 21 ninja 22 ]; 23 24 passthru = {
··· 1 + { lib 2 + , stdenv 3 , fetchurl 4 + , bash 5 , gnome 6 , meson 7 , python3 ··· 16 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 17 sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao="; 18 }; 19 + 20 + strictDeps = true; 21 22 nativeBuildInputs = [ 23 meson 24 python3 25 ninja 26 + ]; 27 + 28 + # for shebangs 29 + buildInputs = [ 30 + python3 31 + bash 32 ]; 33 34 passthru = {