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

tdesktop: 1.9.4 -> 1.9.7 (#78390)

Browse Source 
This also properly enables the spell checking with enchant2.

Note: This requires a proper configuration.
A quick and dirty solution (not recommended) could look like this:
install -Dt ~/.config/enchant/hunspell/ $(nix-build -A hunspellDicts.en_US)/share/hunspell/en_US.{aff,dic}
This commit is contained in:
Michael Weiss 2020-01-23 23:51:05 +01:00 committed by GitHub
parent 3a4e550944
commit 0d97ef510b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,34 +18,35 @@ with lib;
mkDerivation rec { mkDerivation rec {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "1.9.4"; version = "1.9.7";
# Note: Due to our strong dependency on the Arch patches it's probably best # 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). # to also wait for the Arch update (especially if the patches don't apply).
# Telegram-Desktop with submodules # Telegram-Desktop with submodules
src = fetchurl { src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "1ldsgbix0ca4pl2z55wiz90ll3542zsm9slayrzyr7b2jw7arxwy"; sha256 = "1hj7bv11alc8cfffy0k3za4missdr44cdmia93xn77w012qjn8a4";
}; };
# Arch patches (svn export telegram-desktop/trunk) # Arch patches (svn export telegram-desktop/trunk)
archPatches = fetchsvn { archPatches = fetchsvn {
url = "svn://svn.archlinux.org/community/telegram-desktop/trunk"; url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
rev = "553350"; rev = "554983";
sha256 = "05fyij490flrbn4jfwhm8gx9imh0wfby4j9fj69f45qgkpsd7ajb"; sha256 = "02gk5dlrmxvyl7w1yxmwclknk1k9drpx6rxqc6vmmw85l763m95j";
}; };
# Note: It would be best if someone could get as many patches upstream as # Note: It would be best if someone could get as many patches upstream as
# possible (we currently depend a lot on custom patches...). # possible (we currently depend a lot on custom patches...).
patches = [ patches = [
"${archPatches}/0005-Use-system-wide-fonts.patch" "${archPatches}/0005-Use-system-wide-fonts.patch"
"${archPatches}/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch"
]; ];
postPatch = '' postPatch = ''
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
--replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \
--replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"'
''; '';
# We want to run wrapProgram manually (with additional parameters) # We want to run wrapProgram manually (with additional parameters)
@ -90,6 +91,7 @@ mkDerivation rec {
"-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON" "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON"
"-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF"
#"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""'
"-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default
]; ];
# Note: The following packages could be packaged system-wide, but it's # Note: The following packages could be packaged system-wide, but it's
@ -108,7 +110,7 @@ mkDerivation rec {
# https://github.com/NixOS/nixpkgs/pull/75210 # https://github.com/NixOS/nixpkgs/pull/75210
installPhase = '' installPhase = ''
install -Dm755 bin/Telegram $out/bin/telegram-desktop install -Dm755 bin/telegram-desktop $out/bin/telegram-desktop
mkdir -p $out/share/{kservices5,applications,metainfo} mkdir -p $out/share/{kservices5,applications,metainfo}
sed "s,/usr/bin,$out/bin,g" "../lib/xdg/tg.protocol" > "$out/share/kservices5/tg.protocol" sed "s,/usr/bin,$out/bin,g" "../lib/xdg/tg.protocol" > "$out/share/kservices5/tg.protocol"