public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tdesktopPackages.preview: 1.4.7 -> 1.4.8

This commit is contained in:
Michael Weiss 2018-12-06 11:51:28 +01:00
parent 3861b9c19e
commit 20c6acb436
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,8 +13,8 @@ let
in { in {
stable = mkTelegram stableVersion; stable = mkTelegram stableVersion;
preview = mkTelegram (stableVersion // { preview = mkTelegram (stableVersion // {
version = "1.4.7"; version = "1.4.8";
sha256Hash = "00kjirikywdbigm4zdnm50s3wxfn9bw1yx13xz4k4ppz6amq9nrp"; sha256Hash = "0jn7nyvx5kmva418hi1x1awbycmhgk82gazx49kmdxspdd4nsrgj";
stable = false; stable = false;
}); });
} }

15
pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
View File

@ -8,7 +8,15 @@
with lib; with lib;
mkDerivation rec { let
# TODO: Not optimal (maybe we should only package the stable versions)
previewPatches = fetchFromGitHub {
owner = "primeos";
repo = "nixpkgs-tdesktop-patches";
rev = "b3c0cbce1b412443a8712c90069932bbcae87fb6";
sha256 = "1bymrciaci6plghaz7a6qwsidjm8rg5fqdh158cdp70il4g7kmw9";
};
in mkDerivation rec {
name = "telegram-desktop-${version}"; name = "telegram-desktop-${version}";
inherit version; inherit version;
@ -29,7 +37,10 @@ mkDerivation rec {
}; };
# TODO: libtgvoip.patch no-gtk2.patch # TODO: libtgvoip.patch no-gtk2.patch
patches = [ "${archPatches}/tdesktop.patch" ] patches =
(if stable
then [ "${archPatches}/tdesktop.patch" ]
else [ "${previewPatches}/tdesktop.patch" ])
# TODO: Only required to work around a compiler bug. # TODO: Only required to work around a compiler bug.
# This should be fixed in GCC 7.3.1 (or later?) # This should be fixed in GCC 7.3.1 (or later?)
++ [ ./fix-internal-compiler-error.patch ]; ++ [ ./fix-internal-compiler-error.patch ];