diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-01-23 23:51:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 23:51:05 +0100 |
commit | 0d97ef510bdc9d66f1023f970be58fdab2eb87fa (patch) | |
tree | 480a32b28ab82c966c1a400b285b1d91d5a773e2 /pkgs/applications | |
parent | 3a4e550944cc0cf760766111944dd24f13081be6 (diff) | |
download | nixpkgs-0d97ef510bdc9d66f1023f970be58fdab2eb87fa.tar nixpkgs-0d97ef510bdc9d66f1023f970be58fdab2eb87fa.tar.gz nixpkgs-0d97ef510bdc9d66f1023f970be58fdab2eb87fa.tar.bz2 nixpkgs-0d97ef510bdc9d66f1023f970be58fdab2eb87fa.tar.lz nixpkgs-0d97ef510bdc9d66f1023f970be58fdab2eb87fa.tar.xz nixpkgs-0d97ef510bdc9d66f1023f970be58fdab2eb87fa.tar.zst nixpkgs-0d97ef510bdc9d66f1023f970be58fdab2eb87fa.zip |
tdesktop: 1.9.4 -> 1.9.7 (#78390)
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}
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 25ee992cb6c..66dab786b7c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -18,34 +18,35 @@ with lib; mkDerivation rec { 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 # to also wait for the Arch update (especially if the patches don't apply). # Telegram-Desktop with submodules src = fetchurl { 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) archPatches = fetchsvn { url = "svn://svn.archlinux.org/community/telegram-desktop/trunk"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - rev = "553350"; - sha256 = "05fyij490flrbn4jfwhm8gx9imh0wfby4j9fj69f45qgkpsd7ajb"; + 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" - "${archPatches}/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch" ]; postPatch = '' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ --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) @@ -90,6 +91,7 @@ mkDerivation rec { "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON" "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" #"-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 @@ -108,7 +110,7 @@ mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/75210 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} sed "s,/usr/bin,$out/bin,g" "../lib/xdg/tg.protocol" > "$out/share/kservices5/tg.protocol" |