diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-05-02 20:57:07 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2020-05-02 21:30:07 +0200 |
commit | e9e2f81590b1f1d306af328d03e6ab209ccb2a89 (patch) | |
tree | ba001758db9dc3fc743f1008b54e047b0aad3202 /pkgs/applications/networking/instant-messengers/telegram | |
parent | 662ecb74aa75a71e74dbddbf48036e9f286f3cca (diff) | |
download | nixlib-e9e2f81590b1f1d306af328d03e6ab209ccb2a89.tar nixlib-e9e2f81590b1f1d306af328d03e6ab209ccb2a89.tar.gz nixlib-e9e2f81590b1f1d306af328d03e6ab209ccb2a89.tar.bz2 nixlib-e9e2f81590b1f1d306af328d03e6ab209ccb2a89.tar.lz nixlib-e9e2f81590b1f1d306af328d03e6ab209ccb2a89.tar.xz nixlib-e9e2f81590b1f1d306af328d03e6ab209ccb2a89.tar.zst nixlib-e9e2f81590b1f1d306af328d03e6ab209ccb2a89.zip |
tdesktop: 2.1.0 -> 2.1.1
Regarding microsoft_gsl: The CMake scripts from Telegram-Desktop did not find it anymore (I didn't investigate this) and Arch already made this change during the last update. It's probably best to do the same here especially since Telegram-Desktop is currently based on GSL 3.0.1 while our version is still at 2.1.0.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 6f4099c1d8d5..319f400d95db 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -2,7 +2,7 @@ , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 -, tl-expected, microsoft_gsl, hunspell +, tl-expected, hunspell # TODO: Shouldn't be required: , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , xdg_utils @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.1.0"; + version = "2.1.1"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0l5917w90z9pg1al1hzcycb4yxv03vc88jg958ifl9nlvz1arll6"; + sha256 = "0032csgzwfby5a8q8w9iks7ggv1dcqli3qyhksbzly2xzxmfzqaj"; }; postPatch = '' @@ -43,7 +43,7 @@ mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 - tl-expected microsoft_gsl hunspell + tl-expected hunspell # TODO: Shouldn't be required: pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst ]; @@ -57,6 +57,7 @@ mkDerivation rec { "-DTDESKTOP_API_TEST=ON" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" + "-DDESKTOP_APP_USE_PACKAGED_GSL=OFF" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' |