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

Merge pull request #64589 from uHOOCCOOHu/bump/telegram-1.7.14

Browse Source 
tdesktop: 1.7.10 -> 1.7.14
This commit is contained in:
Elis Hirwing 2019-07-11 08:41:01 +02:00 committed by GitHub
commit 08b828d1c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,11 +4,11 @@ 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.7.10"; version = "1.7.14";
sha256Hash = "04if7siv0ib5sbdkdc7vwmxyjy3fnijrshgc8i8m79marfkn3wac"; sha256Hash = "1bw804a9kffmn23wv0570wihbvfm7jy9cqmxlv196f4j7bw7zkv3";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
archPatchesRevision = "480743"; archPatchesRevision = "487779";
archPatchesHash = "0jfyp642l2850yzgrw3irq8bn6vl44rx2693c5cshwbihd212af7"; archPatchesHash = "0f09hvimb66xqksb2v0zc4ryshx7y7z0rafzjd99x37rpib9f3kq";
}; };
in { in {
stable = mkTelegram stableVersion; stable = mkTelegram stableVersion;

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

@ -28,13 +28,17 @@ mkDerivation rec {
sha256 = archPatchesHash; sha256 = archPatchesHash;
}; };
# TODO: libtgvoip.patch no-gtk2.patch patches = [
# TODO: Avoid tdesktop_lottie_animation_qtdebug.patch and tdesktop_qtlottie_qtdebug.patch "${archPatches}/tdesktop.patch"
patches = [ "${archPatches}/tdesktop.patch" "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" ]; "${archPatches}/no-gtk2.patch"
# "${archPatches}/Use-system-wide-font.patch"
"${archPatches}/tdesktop_lottie_animation_qtdebug.patch"
"${archPatches}/issue6219.patch"
];
postPatch = '' postPatch = ''
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
--replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \ substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \
--replace '"notify"' '"${libnotify}/lib/libnotify.so"' --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
''; '';
@ -75,12 +79,14 @@ mkDerivation rec {
CPPFLAGS = NIX_CFLAGS_COMPILE; CPPFLAGS = NIX_CFLAGS_COMPILE;
preConfigure = '' preConfigure = ''
patch -R -Np1 -i "${archPatches}/demibold.patch"
pushd "Telegram/ThirdParty/libtgvoip" pushd "Telegram/ThirdParty/libtgvoip"
patch -Np1 -i "${archPatches}/libtgvoip.patch" patch -Np1 -i "${archPatches}/libtgvoip.patch"
popd popd
pushd "Telegram/ThirdParty/qtlottie"
patch -Np1 -i "${archPatches}/tdesktop_qtlottie_qtdebug.patch" # disable static-qt for rlottie
popd sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp"
sed -i Telegram/gyp/telegram_linux.gypi \ sed -i Telegram/gyp/telegram_linux.gypi \
-e 's,/usr,/does-not-exist,g' \ -e 's,/usr,/does-not-exist,g' \
@ -118,6 +124,8 @@ mkDerivation rec {
export ASM=$(type -p gcc) export ASM=$(type -p gcc)
''; '';
cmakeFlags = [ "-UTDESKTOP_OFFICIAL_TARGET" ];
installPhase = '' installPhase = ''
install -Dm755 Telegram $out/bin/telegram-desktop install -Dm755 Telegram $out/bin/telegram-desktop