alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

tdesktop: 2.1.0 -> 2.1.1

Browse source 
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.
This commit is contained in:
Michael Weiss 2020-05-02 20:57:07 +02:00
parent 662ecb74aa
commit e9e2f81590
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file

@ -2,7 +2,7 @@
, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
, dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
, tl-expected, microsoft_gsl, hunspell , tl-expected, hunspell
# TODO: Shouldn't be required: # TODO: Shouldn't be required:
, pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
, xdg_utils , xdg_utils
@ -19,12 +19,12 @@ with lib;
mkDerivation rec { mkDerivation rec {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "2.1.0"; version = "2.1.1";
# 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 = "0l5917w90z9pg1al1hzcycb4yxv03vc88jg958ifl9nlvz1arll6"; sha256 = "0032csgzwfby5a8q8w9iks7ggv1dcqli3qyhksbzly2xzxmfzqaj";
}; };
postPatch = '' postPatch = ''
@ -43,7 +43,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash
dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3
tl-expected microsoft_gsl hunspell tl-expected hunspell
# TODO: Shouldn't be required: # TODO: Shouldn't be required:
pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst
]; ];
@ -57,6 +57,7 @@ mkDerivation rec {
"-DTDESKTOP_API_TEST=ON" "-DTDESKTOP_API_TEST=ON"
"-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF"
"-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF"
"-DDESKTOP_APP_USE_PACKAGED_GSL=OFF"
"-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=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 '""'