mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
Merge pull request #208437 from NickCao/tdesktop
tdesktop: 4.4.1 -> 4.5.3
This commit is contained in:
commit
efda292199
@ -67,7 +67,7 @@
|
||||
let
|
||||
tg_owt = callPackage ./tg_owt.nix {
|
||||
abseil-cpp = abseil-cpp.override {
|
||||
cxxStandard = "17";
|
||||
cxxStandard = "20";
|
||||
};
|
||||
};
|
||||
# Aarch64 default gcc9 will cause ICE. For reference #108305
|
||||
@ -75,7 +75,7 @@ let
|
||||
in
|
||||
env.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.4.1";
|
||||
version = "4.5.3";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
@ -84,7 +84,7 @@ env.mkDerivation rec {
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0c30kxgp48ha1xv3l59ry21n2c536ax8a15cfk2n1r5n1ns2pfq0";
|
||||
sha256 = "060ajv9dd87qs202jr09i842vww1x25mg7vriyvmyw6rz0qf0d8l";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tg_owt";
|
||||
version = "unstable-2022-09-14";
|
||||
version = "unstable-2023-01-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desktop-app";
|
||||
repo = "tg_owt";
|
||||
rev = "621f3da55331733bf0d1b223786b96b68c03dca1";
|
||||
sha256 = "0xh4mm8lpiyj3c62iarsld8q82a1w81x3dxdlcwq8s6sg3r04fns";
|
||||
rev = "5098730b9eb6173f0b52068fe2555b7c1015123a";
|
||||
sha256 = "0dnh0l9qb9q43cvm4wfgmgqp48grqqz9fb7f48nvys1b6pzhh3pk";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -32631,7 +32631,7 @@ with pkgs;
|
||||
taskopen = callPackage ../applications/misc/taskopen { };
|
||||
|
||||
tdesktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
|
||||
abseil-cpp = abseil-cpp_202111;
|
||||
abseil-cpp = abseil-cpp_202206;
|
||||
};
|
||||
|
||||
telegram-bot-api = callPackage ../servers/telegram-bot-api { };
|
||||
|
Loading…
Reference in New Issue
Block a user