diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2019-08-10 16:19:55 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2019-08-21 12:05:26 +0200 |
commit | b5ee206c16eef91acbb4fffff74a3cde50ca865c (patch) | |
tree | b7b7e8970ed9d2598dcab1cfa567f9771352e969 /pkgs | |
parent | bc0764421e578843a98236a09a3efebbf8d25180 (diff) | |
download | nixlib-b5ee206c16eef91acbb4fffff74a3cde50ca865c.tar nixlib-b5ee206c16eef91acbb4fffff74a3cde50ca865c.tar.gz nixlib-b5ee206c16eef91acbb4fffff74a3cde50ca865c.tar.bz2 nixlib-b5ee206c16eef91acbb4fffff74a3cde50ca865c.tar.lz nixlib-b5ee206c16eef91acbb4fffff74a3cde50ca865c.tar.xz nixlib-b5ee206c16eef91acbb4fffff74a3cde50ca865c.tar.zst nixlib-b5ee206c16eef91acbb4fffff74a3cde50ca865c.zip |
tdesktop: 1.8.0 -> 1.8.1
Had to switch from GCC 8 to GCC 9 due to the following internal compiler error: /nix/store/qsc6w1cnjp4pr7d90bhc0sid01i8k0a0-range-v3-0.5.0/include/range/v3/utility/compressed_pair.hpp:50:92: internal compiler error: in tsubst_pack_expansion, at cp/pt.c:12200 meta::if_<meta::strict_and<std::is_constructible<Ts, Args>...>, int> = 0> ^
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 20 |
1 files changed, 14 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 4f9bbe021d18..570d8c09120a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch -, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc8 +, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc9 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -7,15 +7,17 @@ with lib; mkDerivation rec { - name = "telegram-desktop-${version}"; - version = "1.8.0"; + pname = "telegram-desktop"; + version = "1.8.1"; + # 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 = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "09r62dra6gab8hiyzyysslgqkzswf8vwfkcixbcb0jk5la0m07yy"; + sha256 = "05k5k796z5x0dxgy7dicplx8a2jfjcy35d2h5cn4x4h2n00i5qgf"; fetchSubmodules = true; }; @@ -31,6 +33,8 @@ mkDerivation rec { sha256 = "1s5xvcp9dk0jfywssk8xfcsh7bk5xxif8xqnba0413lfx5rgvs5v"; }; + # 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}/tdesktop.patch" "${archPatches}/no-gtk2.patch" @@ -45,12 +49,12 @@ mkDerivation rec { --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; - nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc8 ]; - # We want to run wrapProgram manually (with additional parameters) dontWrapGApps = true; dontWrapQtApps = true; + nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc9 ]; + buildInputs = [ qtbase qtimageformats gtk3 libappindicator-gtk3 dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 @@ -157,6 +161,10 @@ mkDerivation rec { meta = { description = "Telegram Desktop messaging app"; + longDescription = '' + Desktop client for the Telegram messenger, based on the Telegram API and + the MTProto secure protocol. + ''; license = licenses.gpl3; platforms = platforms.linux; homepage = https://desktop.telegram.org/; |