nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-14 17:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

tdesktop: 1.4.3 -> 1.5.1

Browse Source 
tdesktopPackages.preview: 1.4.8 -> 1.5.1
This commit is contained in:
Michael Weiss 2018-10-13 14:13:58 +02:00
parent ccd160023c
commit e12009f390
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,17 +4,15 @@ let
mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
stableVersion = { stableVersion = {
stable = true; stable = true;
version = "1.4.3"; version = "1.5.1";
sha256Hash = "1pvjvndqc7ylgc8ihf20fl1vb1x6fj7ywl6p1fr16j683vhdcml8"; sha256Hash = "1y2fhw57g6raiv820sb53hjsqrmm81ij58dxlrv64z7ng0s8cnar";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
archPatchesRevision = "388730"; archPatchesRevision = "415526";
archPatchesHash = "1gvisz36bc6bl4zcpjyyk0a2dl6ixp65an8wgm2lkc9mhkl783q7"; archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik";
}; };
in { in {
stable = mkTelegram stableVersion; stable = mkTelegram stableVersion;
preview = mkTelegram (stableVersion // { preview = mkTelegram (stableVersion // {
version = "1.4.8";
sha256Hash = "0jn7nyvx5kmva418hi1x1awbycmhgk82gazx49kmdxspdd4nsrgj";
stable = false; stable = false;
}); });
} }

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

@ -8,15 +8,7 @@
with lib; with lib;
let mkDerivation rec {
# 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;
@ -37,10 +29,7 @@ in mkDerivation rec {
}; };
# TODO: libtgvoip.patch no-gtk2.patch # TODO: libtgvoip.patch no-gtk2.patch
patches = patches = [ "${archPatches}/tdesktop.patch" ]
(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 ];
@ -109,9 +98,9 @@ in mkDerivation rec {
sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \ sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \
-e "/-msse2/d" -e "/-msse2/d"
gyp ${lib.optionalString (!stable) '' gyp \
-Dapi_id=17349 \ -Dapi_id=17349 \
-Dapi_hash=344583e45741c457fe1862106095a5eb ''}\ -Dapi_hash=344583e45741c457fe1862106095a5eb \
-Dbuild_defines=${GYP_DEFINES} \ -Dbuild_defines=${GYP_DEFINES} \
-Gconfig=Release \ -Gconfig=Release \
--depth=Telegram/gyp \ --depth=Telegram/gyp \