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-12 12:28:34 +0100 |
| commit | e12009f390d368c83635ccf32cf918ba1c69b099 (patch) | |
| tree | 331753f38b967bd3955df2623d6be8fbce2b57b6 /pkgs/applications/networking/instant-messengers/telegram | |
| parent | ccd160023ca51df359e7163790d6511377d86262 (diff) | |
| download | nixlib-e12009f390d368c83635ccf32cf918ba1c69b099.tar nixlib-e12009f390d368c83635ccf32cf918ba1c69b099.tar.gz nixlib-e12009f390d368c83635ccf32cf918ba1c69b099.tar.bz2 nixlib-e12009f390d368c83635ccf32cf918ba1c69b099.tar.lz nixlib-e12009f390d368c83635ccf32cf918ba1c69b099.tar.xz nixlib-e12009f390d368c83635ccf32cf918ba1c69b099.tar.zst nixlib-e12009f390d368c83635ccf32cf918ba1c69b099.zip | |
tdesktop: 1.4.3 -> 1.5.1
tdesktopPackages.preview: 1.4.8 -> 1.5.1
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix | 21 |
2 files changed, 9 insertions, 22 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 6953b3bc6e8e..7a9bef45b25f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,17 +4,15 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.4.3"; - sha256Hash = "1pvjvndqc7ylgc8ihf20fl1vb1x6fj7ywl6p1fr16j683vhdcml8"; + version = "1.5.1"; + sha256Hash = "1y2fhw57g6raiv820sb53hjsqrmm81ij58dxlrv64z7ng0s8cnar"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "388730"; - archPatchesHash = "1gvisz36bc6bl4zcpjyyk0a2dl6ixp65an8wgm2lkc9mhkl783q7"; + archPatchesRevision = "415526"; + archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik"; }; in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { - 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 900e0980e74c..302eb975d810 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -8,15 +8,7 @@ with lib; -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 { +mkDerivation rec { name = "telegram-desktop-${version}"; inherit version; @@ -37,10 +29,7 @@ in mkDerivation rec { }; # TODO: libtgvoip.patch no-gtk2.patch - patches = - (if stable - then [ "${archPatches}/tdesktop.patch" ] - else [ "${previewPatches}/tdesktop.patch" ]) + patches = [ "${archPatches}/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 ]; @@ -109,9 +98,9 @@ in mkDerivation rec { sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \ -e "/-msse2/d" - gyp ${lib.optionalString (!stable) '' - -Dapi_id=17349 \ - -Dapi_hash=344583e45741c457fe1862106095a5eb ''}\ + gyp \ + -Dapi_id=17349 \ + -Dapi_hash=344583e45741c457fe1862106095a5eb \ -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ --depth=Telegram/gyp \ |