tdesktop: Remove the last custom patch from Arch Linux

This patch is not required anymore [0][1].
Thanks @ilya-fedin for pointing this out.

[0]: https://git.archlinux.org/svntogit/community.git/commit/?id=a6dbffec8b2f6f319822df8b7db3ba66f81407ce
[1]: https://bugs.archlinux.org/task/65259
This commit is contained in:
Michael Weiss 2020-01-27 18:49:39 +01:00
parent 752639c2bf
commit 5e46d5a7b5
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83

View File

@ -10,17 +10,15 @@
with lib;
# Main reference:
# - This package is based on the Arch package:
# - This package was originally based on the Arch package but all patches are now upstreamed:
# https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop
# Other references that could be useful (but we should try to stick to Arch):
# Other references that could be useful:
# - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD
# - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template
mkDerivation rec {
pname = "telegram-desktop";
version = "1.9.8";
# Note: Due to our strong dependency on the Arch patches it's probably best
# to also wait for the Arch update (especially if the patches don't apply).
# Telegram-Desktop with submodules
src = fetchurl {
@ -28,20 +26,6 @@ mkDerivation rec {
sha256 = "1rq3180l4ly0n0jj08cxy9l2d07scwp9hasmliva2xspyv7i9ksd";
};
# Arch patches (svn export telegram-desktop/trunk)
archPatches = fetchsvn {
url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
rev = "554983";
sha256 = "02gk5dlrmxvyl7w1yxmwclknk1k9drpx6rxqc6vmmw85l763m95j";
};
# Note: It would be best if someone could get as many patches upstream as
# possible (we currently depend a lot on custom patches...).
patches = [
"${archPatches}/0005-Use-system-wide-fonts.patch"
];
postPatch = ''
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
--replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
@ -66,9 +50,9 @@ mkDerivation rec {
cmakeFlags = [
"-Ddisable_autoupdate=ON"
#"-DTDESKTOP_API_TEST=ON" # TODO: Officiall API credentials for Nixpkgs
"-DTDESKTOP_API_ID=17349" # See: https://github.com/NixOS/nixpkgs/issues/55271
"-DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb"
# TODO: Officiall API credentials for Nixpkgs
# (see: https://github.com/NixOS/nixpkgs/issues/55271):
"-DTDESKTOP_API_TEST=ON"
"-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF"
"-DDESKTOP_APP_USE_PACKAGED=ON"
"-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF"