diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2018-10-13 14:13:58 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2018-12-23 12:27:05 +0100 |
| commit | ff70335091ba5115feee33219fe0ef72118a85c0 (patch) | |
| tree | 1be42cae0d0c36523e2f4c80fad03f23c4f57d3e /pkgs/applications/networking/instant-messengers/telegram | |
| parent | 5caeaf1576a381677381479ea779d62170d6c1a2 (diff) | |
| download | nixlib-ff70335091ba5115feee33219fe0ef72118a85c0.tar nixlib-ff70335091ba5115feee33219fe0ef72118a85c0.tar.gz nixlib-ff70335091ba5115feee33219fe0ef72118a85c0.tar.bz2 nixlib-ff70335091ba5115feee33219fe0ef72118a85c0.tar.lz nixlib-ff70335091ba5115feee33219fe0ef72118a85c0.tar.xz nixlib-ff70335091ba5115feee33219fe0ef72118a85c0.tar.zst nixlib-ff70335091ba5115feee33219fe0ef72118a85c0.zip | |
tdesktop: 1.5.2 -> 1.5.3
tdesktopPackages.preview: 1.5.2 -> 1.5.3
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c74226e1e40c..6b892a5baeac 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.5.2"; - sha256Hash = "0kg1xw1b4zj5a2yf6x5r7wrpl7w0fs52s58w606n9gyx7kdcgkj8"; + version = "1.5.3"; + sha256Hash = "13gl81zb9739hs7p3pfavr2lcikajljf03g2x3zgcb9zyarwffg4"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "415526"; archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 302eb975d810..398ddac3dda5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -1,6 +1,6 @@ { stable, version, sha256Hash, archPatchesRevision, archPatchesHash }: -{ mkDerivation, lib, fetchFromGitHub, fetchsvn +{ mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch , pkgconfig, pythonPackages, cmake, wrapGAppsHook , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 @@ -29,7 +29,13 @@ mkDerivation rec { }; # TODO: libtgvoip.patch no-gtk2.patch - patches = [ "${archPatches}/tdesktop.patch" ] + patches = [ + "${archPatches}/tdesktop.patch" + (fetchpatch { + url = "https://github.com/telegramdesktop/tdesktop/commit/4e692e2c1e10538d7fd3e7c0e0a66e0ba474fe76.patch"; + sha256 = "11pv7ib56aq69q9257b9p7wxd2f8xcr6mavswzqw0lndvcx8a5dz"; + }) + ] # TODO: Only required to work around a compiler bug. # This should be fixed in GCC 7.3.1 (or later?) ++ [ ./fix-internal-compiler-error.patch ]; |