From 20c6acb4360a005555127aa90f32c4bcb4c6ebe3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 6 Dec 2018 11:51:28 +0100 Subject: [PATCH] tdesktopPackages.preview: 1.4.7 -> 1.4.8 --- .../telegram/tdesktop/default.nix | 4 ++-- .../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 b5994d03bc6..6953b3bc6e8 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 7736c8b66bd..900e0980e74 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 ];