diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2018-12-06 11:51:28 +0100 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2018-12-06 21:50:49 +0100 |
commit | 20c6acb4360a005555127aa90f32c4bcb4c6ebe3 (patch) | |
tree | 343da08989e151aacf354f3adb306b67c4f0aad2 /pkgs/applications/networking/instant-messengers/telegram | |
parent | 3861b9c19e755fcf02ac66579bb3d8da44033660 (diff) | |
download | nixlib-20c6acb4360a005555127aa90f32c4bcb4c6ebe3.tar nixlib-20c6acb4360a005555127aa90f32c4bcb4c6ebe3.tar.gz nixlib-20c6acb4360a005555127aa90f32c4bcb4c6ebe3.tar.bz2 nixlib-20c6acb4360a005555127aa90f32c4bcb4c6ebe3.tar.lz nixlib-20c6acb4360a005555127aa90f32c4bcb4c6ebe3.tar.xz nixlib-20c6acb4360a005555127aa90f32c4bcb4c6ebe3.tar.zst nixlib-20c6acb4360a005555127aa90f32c4bcb4c6ebe3.zip |
tdesktopPackages.preview: 1.4.7 -> 1.4.8
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 | 15 |
2 files changed, 15 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 b5994d03bc68..6953b3bc6e8e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -13,8 +13,8 @@ let in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { - version = "1.4.7"; - sha256Hash = "00kjirikywdbigm4zdnm50s3wxfn9bw1yx13xz4k4ppz6amq9nrp"; + version = "1.4.8"; + sha256Hash = "0jn7nyvx5kmva418hi1x1awbycmhgk82gazx49kmdxspdd4nsrgj"; stable = false; }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 7736c8b66bd1..900e0980e74c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -8,7 +8,15 @@ 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}"; inherit version; @@ -29,7 +37,10 @@ mkDerivation rec { }; # 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. # This should be fixed in GCC 7.3.1 (or later?) ++ [ ./fix-internal-compiler-error.patch ]; |