nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #152702 from MrMebelMan/update/tdesktop

Browse Source 
tdesktop: 3.1.11 -> 3.4.3
This commit is contained in:
Marek Mahut 2022-01-04 13:43:33 +01:00 committed by GitHub
commit 2fe2069f92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -48,6 +48,8 @@
, brotli
, microsoft_gsl
, rlottie
, stdenv
, gcc10Stdenv
}:
# Main reference:
@ -63,10 +65,12 @@ let
cxxStandard = "17";
};
};
# Aarch64 default gcc9 will cause ICE. For reference #108305
env = if stdenv.isAarch64 then gcc10Stdenv else stdenv;
in
mkDerivation rec {
env.mkDerivation rec {
pname = "telegram-desktop";
version = "3.1.11";
version = "3.4.3";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -75,7 +79,7 @@ mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0hpcsraw3gx37wk3r88q51qf68ny0kb3kd6slnklwf22d1jqr3fn";
sha256 = "0w8llqc4ffhp4gkvk6cyxah16yxm15am0msg3qn39fi2qqnm01x8";
};
postPatch = ''
@ -154,6 +158,8 @@ mkDerivation rec {
"-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
# See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649
"-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
# TODO: Remove once QT6 is available in nixpkgs
"-DDESKTOP_APP_QT6=OFF"
];
postFixup = ''

6
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation {
pname = "tg_owt";
version = "unstable-2021-10-21";
version = "unstable-2021-12-22";
src = fetchFromGitHub {
owner = "desktop-app";
repo = "tg_owt";
rev = "d578c760dc6f1ae5f0f3bb5317b0b2ed04b79138";
sha256 = "12lr50nma3j9df55sxi6p48yhn9yxrwzz5yrx7r29p8p4fv1c75w";
rev = "6708e0d31a73e64fe12f54829bf4060c41b2658e";
sha256 = "081ylw8vp8c84x3f1xx1kia6k1sds2iza9fm5dvn3ccgjwxdm5ny";
fetchSubmodules = true;
};